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

Unified Diff: chrome/browser/background_mode_manager.h

Issue 5368002: Move Mac LaunchOnStartup enable/disable to File thread (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed previous attempt to resolve merge conflict Created 10 years 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 | « no previous file | chrome/browser/background_mode_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/background_mode_manager.h
diff --git a/chrome/browser/background_mode_manager.h b/chrome/browser/background_mode_manager.h
index 6da40ece9317ce24b0482c82d0a2303bb2a95ad3..9407d4aa6981054274a8cb41ecd61a64f553ca38 100644
--- a/chrome/browser/background_mode_manager.h
+++ b/chrome/browser/background_mode_manager.h
@@ -44,8 +44,6 @@ class BackgroundModeManager
BackgroundModeManager(Profile* profile, CommandLine* command_line);
virtual ~BackgroundModeManager();
- static void RegisterUserPrefs(PrefService* prefs);
-
static bool IsBackgroundModeEnabled(const CommandLine* command_line);
private:
@@ -95,12 +93,6 @@ class BackgroundModeManager
// launch-on-startup is disabled if appropriate.
void OnBackgroundAppUninstalled();
- // Returns true if chrome has set "launch on startup" property for itself
- // earlier and is allowed to reset it later, reducing likelihood of
- // overriding user choices.
- bool IsLaunchOnStartupResetAllowed();
- void SetLaunchOnStartupResetAllowed(bool allowed);
-
// Called to make sure that our launch-on-startup mode is properly set.
// (virtual so we can override for tests).
virtual void EnableLaunchOnStartup(bool should_launch);
@@ -119,6 +111,10 @@ class BackgroundModeManager
// manually, or all apps have been loaded).
void EndKeepAliveForStartup();
+ // Return an appropriate name for a Preferences menu entry. Preferences is
+ // sometimes called Options or Settings.
+ string16 GetPreferencesMenuLabel();
+
// Create a status tray icon to allow the user to shutdown Chrome when running
// in background mode. Virtual to enable testing.
virtual void CreateStatusTrayIcon();
« no previous file with comments | « no previous file | chrome/browser/background_mode_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698