diff options
| author | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-26 01:26:16 +0000 |
|---|---|---|
| committer | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-26 01:26:16 +0000 |
| commit | 73370a927df892652c45dab804301423c78d3c0c (patch) | |
| tree | 54be3020d4ac126b690e213eeb866e4263cb0984 | |
| parent | 96690a420b73c1b5a4ae350a1a13963b90dabbec (diff) | |
| download | chromium_src-73370a927df892652c45dab804301423c78d3c0c.zip chromium_src-73370a927df892652c45dab804301423c78d3c0c.tar.gz chromium_src-73370a927df892652c45dab804301423c78d3c0c.tar.bz2 | |
Reverting 24385.
Review URL: http://codereview.chromium.org/173443
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24399 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/browser_main.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/new_tab_ui.cc | 2 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.cc | 2 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 6e49ab4..9b71bde 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::kDisableWebResources)) + if (parsed_command_line.HasSwitch(switches::kEnableWebResources)) 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 ab9440b..6e90533 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::kDisableWebResources); + return command_line->HasSwitch(switches::kEnableWebResources); } // static diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 27d563d..8fc249e 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 kDisableWebResources[] = L"disable-web-resources"; +const wchar_t kEnableWebResources[] = L"enable-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 c91c558..ef9a465 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 kDisableWebResources[]; +extern const wchar_t kEnableWebResources[]; extern const wchar_t kEnableBenchmarking[]; |