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

Unified Diff: chrome/browser/profiles/profile_io_data.cc

Issue 209473008: Block all web requests until force enrollment status has been confirmed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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/profiles/profile_io_data.cc
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
index 0487c01bb977d2ef61b9db46c3c47015e2ee5527..a6ef93d26bcc77d45738da4f55fd8c9b89e9f9e7 100644
--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
@@ -93,6 +93,7 @@
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/drive/drive_protocol_handler.h"
+#include "chrome/browser/chromeos/login/startup_utils.h"
#include "chrome/browser/chromeos/login/user.h"
#include "chrome/browser/chromeos/login/user_manager.h"
#include "chrome/browser/chromeos/net/cert_verify_proc_chromeos.h"
@@ -441,12 +442,18 @@ void ProfileIOData::InitializeOnUIThread(Profile* profile) {
base::SequencedWorkerPool* pool = BrowserThread::GetBlockingPool();
scoped_refptr<base::SequencedTaskRunner> background_task_runner =
pool->GetSequencedTaskRunner(pool->GetSequenceToken());
+ // OOBE is only a thing on ChromeOS on other platforms just assume it is done.
+ bool is_oobe_done = true;
+#if defined(OS_CHROMEOS)
+ is_oobe_done = chromeos::StartupUtils::IsOobeCompleted();
+#endif
url_blacklist_manager_.reset(
- new policy::URLBlacklistManager(pref_service,
- background_task_runner,
- io_message_loop_proxy,
- callback,
- policy::OverrideBlacklistForURL));
+ new policy::URLBlacklistManager(
+ pref_service,
+ background_task_runner,
+ io_message_loop_proxy,
+ callback,
+ base::Bind(policy::OverrideBlacklistForURL, is_oobe_done)));
if (!IsOffTheRecord()) {
// Add policy headers for non-incognito requests.

Powered by Google App Engine
This is Rietveld 408576698