Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3034)

Unified Diff: chrome/browser/background/background_mode_manager.cc

Issue 12096060: browser: Start moving application_lifetime.h functions into chrome namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/app_controller_mac.mm ('k') | chrome/browser/background/background_mode_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/background/background_mode_manager.cc
diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc
index 30c2e4f4aa2360b111d2ad280481a30155c23686..7fe3e21ef931b32735b4b3afdb843229bfa99ace 100644
--- a/chrome/browser/background/background_mode_manager.cc
+++ b/chrome/browser/background/background_mode_manager.cc
@@ -184,7 +184,7 @@ BackgroundModeManager::BackgroundModeManager(
// there are background apps) or exit if there are none.
if (command_line->HasSwitch(switches::kNoStartupWindow)) {
keep_alive_for_startup_ = true;
- browser::StartKeepAlive();
+ chrome::StartKeepAlive();
}
// If the -keep-alive-for-test flag is passed, then always keep chrome running
@@ -504,7 +504,7 @@ void BackgroundModeManager::ExecuteCommand(int command_id) {
// Background mode must already be enabled (as otherwise this menu would
// not be visible).
DCHECK(IsBackgroundModePrefEnabled());
- DCHECK(browser::WillKeepAlive());
+ DCHECK(chrome::WillKeepAlive());
// Set the background mode pref to "disabled" - the resulting notification
// will result in a call to DisableBackgroundMode().
@@ -528,8 +528,8 @@ void BackgroundModeManager::EndKeepAliveForStartup() {
// We call this via the message queue to make sure we don't try to end
// keep-alive (which can shutdown Chrome) before the message loop has
// started.
- MessageLoop::current()->PostTask(
- FROM_HERE, base::Bind(&browser::EndKeepAlive));
+ MessageLoop::current()->PostTask(FROM_HERE,
+ base::Bind(&chrome::EndKeepAlive));
}
}
@@ -544,7 +544,7 @@ void BackgroundModeManager::StartBackgroundMode() {
in_background_mode_ = true;
// Put ourselves in KeepAlive mode and create a status tray icon.
- browser::StartKeepAlive();
+ chrome::StartKeepAlive();
// Display a status icon to exit Chrome.
InitStatusTrayIcon();
@@ -568,7 +568,7 @@ void BackgroundModeManager::EndBackgroundMode() {
in_background_mode_ = false;
// End KeepAlive mode and blow away our status tray icon.
- browser::EndKeepAlive();
+ chrome::EndKeepAlive();
RemoveStatusTrayIcon();
content::NotificationService::current()->Notify(
« no previous file with comments | « chrome/browser/app_controller_mac.mm ('k') | chrome/browser/background/background_mode_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698