| Index: chrome/browser/lifetime/application_lifetime_aura.cc
|
| ===================================================================
|
| --- chrome/browser/lifetime/application_lifetime_aura.cc (revision 0)
|
| +++ chrome/browser/lifetime/application_lifetime_aura.cc (working copy)
|
| @@ -2,15 +2,16 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "chrome/browser/ui/browser_list.h"
|
| +#include "chrome/browser/lifetime/application_lifetime.h"
|
|
|
| #include "base/command_line.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/browser/browser_process.h"
|
| #include "chrome/browser/notifications/notification_ui_manager.h"
|
|
|
| -// static
|
| -void BrowserList::HandleAppExitingForPlatform() {
|
| +namespace browser {
|
| +
|
| +void HandleAppExitingForPlatform() {
|
| // Close All non browser windows now. Those includes notifications
|
| // and windows created by Ash (launcher, background, etc).
|
| g_browser_process->notification_ui_manager()->CancelAll();
|
| @@ -20,13 +21,15 @@
|
| if (!CommandLine::ForCurrentProcess()->HasSwitch(
|
| switches::kDisableZeroBrowsersOpenForTests)) {
|
| // App is exiting, call EndKeepAlive() on behalf of Aura Shell.
|
| - BrowserList::EndKeepAlive();
|
| + EndKeepAlive();
|
| // Make sure we have notified the session manager that we are exiting.
|
| // This might be called from FastShutdown() or CloseAllBrowsers(), but not
|
| // if something prevents a browser from closing before SetTryingToQuit()
|
| // gets called (e.g. browser->TabsNeedBeforeUnloadFired() is true).
|
| // NotifyAndTerminate does nothing if called more than once.
|
| - BrowserList::NotifyAndTerminate(true);
|
| + NotifyAndTerminate(true);
|
| }
|
| #endif // OS_CHROMEOS
|
| }
|
| +
|
| +} // namespace browser
|
|
|