diff options
| author | jar@google.com <jar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-22 18:21:11 +0000 |
|---|---|---|
| committer | jar@google.com <jar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-22 18:21:11 +0000 |
| commit | 0a00775a41bd90f4f01017362bac3aeadd6c953e (patch) | |
| tree | 26404f7422e9a56f6a955eb14c84d40a14da59ba /chrome/browser/browser_main.cc | |
| parent | 968e176577ac4fe102ce66987eb97e037f67796f (diff) | |
| download | chromium_src-0a00775a41bd90f4f01017362bac3aeadd6c953e.zip chromium_src-0a00775a41bd90f4f01017362bac3aeadd6c953e.tar.gz chromium_src-0a00775a41bd90f4f01017362bac3aeadd6c953e.tar.bz2 | |
Rollback 2444 and 2443 to get linux and mac prep
Also need to augment sln dependencies
tbr
Review URL: http://codereview.chromium.org/3188
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2446 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index fbb216a9..15703a2 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -30,7 +30,6 @@ #include "chrome/browser/jankometer.h" #include "chrome/browser/metrics_service.h" #include "chrome/browser/net/dns_global.h" -#include "chrome/browser/net/sdch_dictionary_fetcher.h" #include "chrome/browser/plugin_service.h" #include "chrome/browser/printing/print_job_manager.h" #include "chrome/browser/rlz/rlz.h" @@ -54,7 +53,6 @@ #include "net/base/net_module.h" #include "net/base/net_resources.h" #include "net/base/net_util.h" -#include "net/base/sdch_manager.h" #include "net/base/winsock_init.h" #include "net/http/http_network_layer.h" @@ -477,15 +475,6 @@ int BrowserMain(CommandLine &parsed_command_line, int show_command, // Initialize the CertStore. CertStore::Initialize(); - // Prepare for memory caching of SDCH dictionaries. - SdchManager sdch_manager; // Construct singleton database. - if (parsed_command_line.HasSwitch(switches::kSdchFilter)) { - sdch_manager.set_sdch_fetcher(new SdchDictionaryFetcher); - std::wstring switch_domain = - parsed_command_line.GetSwitchValue(switches::kSdchFilter); - sdch_manager.enable_sdch_support(WideToASCII(switch_domain)); - } - MetricsService* metrics = NULL; if (!parsed_command_line.HasSwitch(switches::kDisableMetrics)) { if (parsed_command_line.HasSwitch(switches::kDisableMetricsReporting)) { |