diff options
| author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-27 18:53:52 +0000 |
|---|---|---|
| committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-27 18:53:52 +0000 |
| commit | 5640e1ad1eccb7e7f6c966f3a50726942d5b1804 (patch) | |
| tree | 3e6282546298ecd42db694076671d1b7bd8bcdf0 /chrome/browser/views | |
| parent | 232448fb3a5e41030d35e0e1ae1d1664d96406bf (diff) | |
| download | chromium_src-5640e1ad1eccb7e7f6c966f3a50726942d5b1804.zip chromium_src-5640e1ad1eccb7e7f6c966f3a50726942d5b1804.tar.gz chromium_src-5640e1ad1eccb7e7f6c966f3a50726942d5b1804.tar.bz2 | |
Disable BackgroundModeManager by default for M7, and add an --enable-background-mode
command line flag to enable it.
Also remove related preferences items if the --enable-background-mode flag is not passed.
BUG=53522
TEST=BackgroundModeManager unit tests pass, run without flag and look at preferences dialog to make sure preferences are not there, launch chrome with --keep-alive-for-test flag, see that no status icon appears
Review URL: http://codereview.chromium.org/3219001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57713 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views')
| -rw-r--r-- | chrome/browser/views/options/advanced_contents_view.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/chrome/browser/views/options/advanced_contents_view.cc b/chrome/browser/views/options/advanced_contents_view.cc index 4a8123b..665ec53 100644 --- a/chrome/browser/views/options/advanced_contents_view.cc +++ b/chrome/browser/views/options/advanced_contents_view.cc @@ -14,6 +14,7 @@ #include "app/l10n_util.h" #include "app/resource_bundle.h" +#include "base/command_line.h" #include "base/file_util.h" #include "base/i18n/rtl.h" #include "base/message_loop.h" @@ -40,6 +41,7 @@ #include "chrome/browser/views/options/content_settings_window_view.h" #include "chrome/browser/views/options/fonts_languages_window_view.h" #include "chrome/browser/views/restart_message_box.h" +#include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "gfx/canvas_skia.h" #include "gfx/native_theme_win.h" @@ -1458,8 +1460,11 @@ void AdvancedContentsView::InitControlLayout() { layout->AddView(new WebContentSection(profile())); layout->StartRow(0, single_column_view_set_id); layout->AddView(new SecuritySection(profile())); - layout->StartRow(0, single_column_view_set_id); - layout->AddView(new ChromeAppsSection(profile())); + if (CommandLine::ForCurrentProcess()->HasSwitch( + switches::kEnableBackgroundMode)) { + layout->StartRow(0, single_column_view_set_id); + layout->AddView(new ChromeAppsSection(profile())); + } } //////////////////////////////////////////////////////////////////////////////// |