| Index: chrome/browser/apps/app_shim/app_shim_interactive_uitest_mac.mm
|
| diff --git a/chrome/browser/apps/app_shim/app_shim_interactive_uitest_mac.mm b/chrome/browser/apps/app_shim/app_shim_interactive_uitest_mac.mm
|
| index db01452309864406099e7cd47d9c3b55b8327109..ecac1be62c1d6a26029d9a01439d20a63be5a176 100644
|
| --- a/chrome/browser/apps/app_shim/app_shim_interactive_uitest_mac.mm
|
| +++ b/chrome/browser/apps/app_shim/app_shim_interactive_uitest_mac.mm
|
| @@ -126,7 +126,7 @@ class WindowedAppShimLaunchObserver : public apps::AppShimHandler {
|
| // AppShimHandler overrides:
|
| virtual void OnShimLaunch(Host* host,
|
| apps::AppShimLaunchType launch_type,
|
| - const std::vector<base::FilePath>& files) OVERRIDE {
|
| + const std::vector<base::FilePath>& files) override {
|
| // Remove self and pass through to the default handler.
|
| apps::AppShimHandler::RemoveHandler(app_mode_id_);
|
| apps::AppShimHandler::GetForAppMode(app_mode_id_)
|
| @@ -135,12 +135,12 @@ class WindowedAppShimLaunchObserver : public apps::AppShimHandler {
|
| if (run_loop_.get())
|
| run_loop_->Quit();
|
| }
|
| - virtual void OnShimClose(Host* host) OVERRIDE {}
|
| + virtual void OnShimClose(Host* host) override {}
|
| virtual void OnShimFocus(Host* host,
|
| apps::AppShimFocusType focus_type,
|
| - const std::vector<base::FilePath>& files) OVERRIDE {}
|
| - virtual void OnShimSetHidden(Host* host, bool hidden) OVERRIDE {}
|
| - virtual void OnShimQuit(Host* host) OVERRIDE {}
|
| + const std::vector<base::FilePath>& files) override {}
|
| + virtual void OnShimSetHidden(Host* host, bool hidden) override {}
|
| + virtual void OnShimQuit(Host* host) override {}
|
|
|
| private:
|
| std::string app_mode_id_;
|
|
|