| Index: chrome/browser/apps/app_shim/app_shim_quit_interactive_uitest_mac.mm
|
| diff --git a/chrome/browser/apps/app_shim/app_shim_quit_interactive_uitest_mac.mm b/chrome/browser/apps/app_shim/app_shim_quit_interactive_uitest_mac.mm
|
| index 6bbfd6743ab519d62792f96e5e702ae30818e920..f4605057fe3e31978d641e8c2ec91f847269c030 100644
|
| --- a/chrome/browser/apps/app_shim/app_shim_quit_interactive_uitest_mac.mm
|
| +++ b/chrome/browser/apps/app_shim/app_shim_quit_interactive_uitest_mac.mm
|
| @@ -36,16 +36,16 @@ class FakeHost : public apps::AppShimHandler::Host {
|
| app_id_(app_id),
|
| handler_(handler) {}
|
|
|
| - virtual void OnAppLaunchComplete(AppShimLaunchResult result) OVERRIDE {}
|
| - virtual void OnAppClosed() OVERRIDE {
|
| + 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 {
|
| + 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_; }
|
| + virtual std::string GetAppId() const override { return app_id_; }
|
|
|
| private:
|
| base::FilePath profile_path_;
|
| @@ -89,7 +89,7 @@ class AppShimQuitTest : public PlatformAppBrowserTest {
|
| content::RunAllPendingInMessageLoop();
|
| }
|
|
|
| - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
|
| + virtual 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_
|
|
|