Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1380)

Unified Diff: chrome/browser/browser_main.cc

Issue 173357: Error diagnostics for Blacklist IO... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/browser_main.cc
===================================================================
--- chrome/browser/browser_main.cc (revision 25875)
+++ chrome/browser/browser_main.cc (working copy)
@@ -39,6 +39,7 @@
#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"
@@ -96,6 +97,7 @@
#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"
@@ -558,7 +560,19 @@
return ResultCodes::NORMAL_EXIT;
}
+ 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);

Powered by Google App Engine
This is Rietveld 408576698