Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / apps / app_shim / app_shim_quit_interactive_uitest_mac.mm

diff --git a/src/chrome/browser/apps/app_shim/app_shim_quit_interactive_uitest_mac.mm b/src/chrome/browser/apps/app_shim/app_shim_quit_interactive_uitest_mac.mm
index 6bbfd67..15b3f35 100644 (file)
--- a/src/chrome/browser/apps/app_shim/app_shim_quit_interactive_uitest_mac.mm
+++ b/src/chrome/browser/apps/app_shim/app_shim_quit_interactive_uitest_mac.mm
@@ -36,16 +36,12 @@ class FakeHost : public apps::AppShimHandler::Host {
         app_id_(app_id),
         handler_(handler) {}
 
-  virtual void OnAppLaunchComplete(AppShimLaunchResult result) OVERRIDE {}
-  virtual void OnAppClosed() OVERRIDE {
-    handler_->OnShimClose(this);
-  }
-  virtual void OnAppHide() OVERRIDE {}
-  virtual void OnAppRequestUserAttention(AppShimAttentionType type) OVERRIDE {}
-  virtual base::FilePath GetProfilePath() const OVERRIDE {
-    return profile_path_;
-  }
-  virtual std::string GetAppId() const OVERRIDE { return app_id_; }
+  void OnAppLaunchComplete(AppShimLaunchResult result) override {}
+  void OnAppClosed() override { handler_->OnShimClose(this); }
+  void OnAppHide() override {}
+  void OnAppRequestUserAttention(AppShimAttentionType type) override {}
+  base::FilePath GetProfilePath() const override { return profile_path_; }
+  std::string GetAppId() const override { return app_id_; }
 
  private:
   base::FilePath profile_path_;
@@ -89,7 +85,7 @@ class AppShimQuitTest : public PlatformAppBrowserTest {
     content::RunAllPendingInMessageLoop();
   }
 
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  void SetUpCommandLine(CommandLine* command_line) override {
     PlatformAppBrowserTest::SetUpCommandLine(command_line);
     // Simulate an app shim initiated launch, i.e. launch app but not browser.
     app_path_ = test_data_dir_