diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-29 09:40:10 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-29 09:40:10 +0000 |
| commit | 588074f9272367dff91fa584a68b69e5ed200fbb (patch) | |
| tree | e231402fae065b2d600ebbb8a14d510210515e7e /chrome/browser/browser_main.cc | |
| parent | f810a16eb5d1d1d186951234adc52aec99797e05 (diff) | |
| download | chromium_src-588074f9272367dff91fa584a68b69e5ed200fbb.zip chromium_src-588074f9272367dff91fa584a68b69e5ed200fbb.tar.gz chromium_src-588074f9272367dff91fa584a68b69e5ed200fbb.tar.bz2 | |
Design changes in browser/privacy_blacklist needed to integrate
privacy blacklists with extensions.
- change I/O routines interface to be more clear
- distinguish between transient and permanent blacklists
- remove obsolete code (pbl_tool and blacklist error dialog)
BlacklistManager will be responsible for recompiling the persistent
blacklists. Errors will be reported via infobars.
TEST=Covered by unit_tests.
BUG=21541
Review URL: http://codereview.chromium.org/337025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30449 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 1ff657f..24393ce 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -40,7 +40,6 @@ #include "chrome/browser/net/metadata_url_request.h" #include "chrome/browser/net/sdch_dictionary_fetcher.h" #include "chrome/browser/plugin_service.h" -#include "chrome/browser/privacy_blacklist/blacklist.h" #include "chrome/browser/process_singleton.h" #include "chrome/browser/profile_manager.h" #include "chrome/browser/renderer_host/resource_dispatcher_host.h" @@ -102,7 +101,6 @@ #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/profile.h" #include "chrome/browser/rlz/rlz.h" -#include "chrome/browser/views/blacklist_error_dialog.h" #include "chrome/browser/views/user_data_dir_dialog.h" #include "chrome/common/env_vars.h" #include "chrome/installer/util/helper.h" @@ -583,19 +581,6 @@ int BrowserMain(const MainFunctionParams& parameters) { CHECK(profile) << "Cannot get default profile."; #endif - if (profile->GetBlacklist() && !profile->GetBlacklist()->is_good()) { - // TODO(idanan): Enable this for other platforms once the dispatching - // support code has been ported. See ifdefs in message_loop.h. -#if defined(OS_WIN) - bool accepted = BlacklistErrorDialog::RunBlacklistErrorDialog(); - if (!accepted) - return ResultCodes::NORMAL_EXIT; -#else - return ResultCodes::NORMAL_EXIT; -#endif - } - - PrefService* user_prefs = profile->GetPrefs(); DCHECK(user_prefs); |