Error diagnostics for Blacklist IO...

chrome/browser/browser_main.cc

 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "build/build_config.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 21 matching lines @@
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/extensions/extension_protocols.h"
 #include "chrome/browser/first_run.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/net/dns_global.h"
 #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"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/user_data_manager.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/histogram_synchronizer.h"
 #include "chrome/common/jstemplate_builder.h"
@@ skipping 37 matching lines @@
 #include "app/win_util.h"
 #include "base/registry.h"
 #include "base/win_util.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_trial.h"
 #include "chrome/browser/jankometer.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #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"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/shell_util.h"
 #include "chrome/installer/util/version.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"
@@ skipping 442 matching lines @@
       // sounds risky if we parse differently than CommandLineToArgvW.
       CommandLine new_command_line = parsed_command_line;
       new_command_line.AppendSwitchWithValue(switches::kUserDataDir,
                                              user_data_dir.ToWStringHack());
       base::LaunchApp(new_command_line, false, false, NULL);
     }
 #endif  // defined(OS_WIN) || defined(OS_LINUX)
 
     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);
 
   // Now that local state and user prefs have been loaded, make the two pref
   // services aware of all our preferences.
   browser::RegisterAllPrefs(user_prefs, local_state);
 
   // Now that all preferences have been registered, set the install date
   // for the uninstall metrics if this is our first run. This only actually
@@ skipping 273 matching lines @@
   if (metrics)
     metrics->Stop();
 
   // browser_shutdown takes care of deleting browser_process, so we need to
   // release it.
   browser_process.release();
   browser_shutdown::Shutdown();
 
   return result_code;
 }