summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/browser_main.cc2
-rw-r--r--chrome/browser/dom_ui/new_tab_ui.cc2
-rw-r--r--chrome/common/chrome_switches.cc2
-rw-r--r--chrome/common/chrome_switches.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 9b71bde..6e49ab4 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -794,7 +794,7 @@ int BrowserMain(const MainFunctionParams& parameters) {
profile->InitExtensions();
// Start up the web resource service. This starts loading data after a
// short delay so as not to interfere with startup time.
- if (parsed_command_line.HasSwitch(switches::kEnableWebResources))
+ if (!parsed_command_line.HasSwitch(switches::kDisableWebResources))
profile->InitWebResources();
#if defined(OS_CHROMEOS)
diff --git a/chrome/browser/dom_ui/new_tab_ui.cc b/chrome/browser/dom_ui/new_tab_ui.cc
index 6e90533..ab9440b 100644
--- a/chrome/browser/dom_ui/new_tab_ui.cc
+++ b/chrome/browser/dom_ui/new_tab_ui.cc
@@ -1600,7 +1600,7 @@ bool NewTabUI::UseOldNewTabPage() {
// static
bool NewTabUI::WebResourcesEnabled() {
const CommandLine* command_line = CommandLine::ForCurrentProcess();
- return command_line->HasSwitch(switches::kEnableWebResources);
+ return !command_line->HasSwitch(switches::kDisableWebResources);
}
// static
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 8fc249e..27d563d 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -497,7 +497,7 @@ const wchar_t kOldNewTabPage[] = L"old-new-tab-page";
// Enables the backend service for web resources, used in the new tab page for
// loading tips and recommendations from a JSON feed.
-const wchar_t kEnableWebResources[] = L"enable-web-resources";
+const wchar_t kDisableWebResources[] = L"disable-web-resources";
// Whether we should prevent the new tab page from showing the first run
// notification.
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index ef9a465..c91c558 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -186,7 +186,7 @@ extern const wchar_t kNewTabPage[];
extern const wchar_t kOldNewTabPage[];
extern const wchar_t kDisableNewTabFirstRun[];
-extern const wchar_t kEnableWebResources[];
+extern const wchar_t kDisableWebResources[];
extern const wchar_t kEnableBenchmarking[];