| Index: chrome/browser/ui/views/athena/chrome_browser_main_extra_parts_athena.cc
|
| diff --git a/chrome/browser/ui/views/athena/chrome_browser_main_extra_parts_athena.cc b/chrome/browser/ui/views/athena/chrome_browser_main_extra_parts_athena.cc
|
| index e62606c4314bc8de7174823b4647d8948ed72382..db068c1834f84c66b6e7e72bb2069b60e2a56295 100644
|
| --- a/chrome/browser/ui/views/athena/chrome_browser_main_extra_parts_athena.cc
|
| +++ b/chrome/browser/ui/views/athena/chrome_browser_main_extra_parts_athena.cc
|
| @@ -37,14 +37,14 @@ class ChromeBrowserMainExtraPartsAthena : public ChromeBrowserMainExtraParts,
|
|
|
| private:
|
| // Overridden from ChromeBrowserMainExtraParts:
|
| - virtual void PreProfileInit() OVERRIDE {
|
| + virtual void PreProfileInit() override {
|
| athena::StartAthenaEnv(content::BrowserThread::GetBlockingPool()->
|
| GetTaskRunnerWithShutdownBehavior(
|
| base::SequencedWorkerPool::SKIP_ON_SHUTDOWN));
|
|
|
| ui::SelectFileDialog::SetFactory(new SelectFileDialogExtensionFactory);
|
| }
|
| - virtual void PostProfileInit() OVERRIDE {
|
| + virtual void PostProfileInit() override {
|
| if (!CommandLine::ForCurrentProcess()->HasSwitch(
|
| switches::kDisableZeroBrowsersOpenForTests)) {
|
| chrome::IncrementKeepAliveCount();
|
| @@ -61,12 +61,12 @@ class ChromeBrowserMainExtraPartsAthena : public ChromeBrowserMainExtraParts,
|
| athena::CreateVirtualKeyboardWithContext(profile);
|
| }
|
| }
|
| - virtual void PostMainMessageLoopRun() OVERRIDE { athena::ShutdownAthena(); }
|
| + virtual void PostMainMessageLoopRun() override { athena::ShutdownAthena(); }
|
|
|
| // content::NotificationObserver:
|
| virtual void Observe(int type,
|
| const content::NotificationSource& source,
|
| - const content::NotificationDetails& details) OVERRIDE {
|
| + const content::NotificationDetails& details) override {
|
| switch (type) {
|
| case chrome::NOTIFICATION_APP_TERMINATING:
|
| athena::AthenaEnv::Get()->OnTerminating();
|
|
|