summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/background_contents_service.cc2
-rw-r--r--chrome/browser/background_contents_service_unittest.cc1
-rw-r--r--chrome/browser/browser_process_impl.cc3
3 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/background_contents_service.cc b/chrome/browser/background_contents_service.cc
index edd3219..1f173ee 100644
--- a/chrome/browser/background_contents_service.cc
+++ b/chrome/browser/background_contents_service.cc
@@ -44,7 +44,7 @@ BackgroundContentsService::BackgroundContentsService(
// Don't load/store preferences if the proper switch is not enabled, or if
// the parent profile is off the record.
if (!profile->IsOffTheRecord() &&
- command_line->HasSwitch(switches::kRestoreBackgroundContents))
+ !command_line->HasSwitch(switches::kDisableRestoreBackgroundContents))
prefs_ = profile->GetPrefs();
// Listen for events to tell us when to load/unload persisted background
diff --git a/chrome/browser/background_contents_service_unittest.cc b/chrome/browser/background_contents_service_unittest.cc
index 5a0819d..6e028ba 100644
--- a/chrome/browser/background_contents_service_unittest.cc
+++ b/chrome/browser/background_contents_service_unittest.cc
@@ -25,7 +25,6 @@ class BackgroundContentsServiceTest : public testing::Test {
~BackgroundContentsServiceTest() {}
void SetUp() {
command_line_.reset(new CommandLine(CommandLine::ARGUMENTS_ONLY));
- command_line_->AppendSwitch(switches::kRestoreBackgroundContents);
}
DictionaryValue* GetPrefs(Profile* profile) {
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index ff43685..2ca9f62 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -734,8 +734,7 @@ const char* const kSwitchesToRemoveOnAutorestart[] = {
};
const char* const kSwitchesToAddOnAutorestart[] = {
- switches::kNoStartupWindow,
- switches::kRestoreBackgroundContents
+ switches::kNoStartupWindow
};
void BrowserProcessImpl::RestartPersistentInstance() {