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

Unified Diff: chrome/browser/policy/policy_helpers.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
« no previous file with comments | « chrome/browser/policy/policy_helpers.h ('k') | chrome/browser/policy/url_blacklist_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/policy/policy_helpers.cc
diff --git a/chrome/browser/policy/policy_helpers.cc b/chrome/browser/policy/policy_helpers.cc
index e9b6983d65117261a446f62a4c3f4f85f3912cba..cc09cfa6afc8c07c5afbc31732311082b9b70bd1 100644
--- a/chrome/browser/policy/policy_helpers.cc
+++ b/chrome/browser/policy/policy_helpers.cc
@@ -13,8 +13,18 @@
namespace policy {
-bool OverrideBlacklistForURL(const GURL& url, bool* block) {
-#if defined(OS_CHROMEOS) || defined(OS_IOS)
+bool OverrideBlacklistForURL(bool is_oobe_done, const GURL& url, bool* block) {
+#if defined(OS_CHROMEOS)
+ // On ChromeOS browsing is only allowed once OOBE has completed. Therefore all
+ // requests are blocked until this condition is met.
+ if (!is_oobe_done) {
+ if (url.SchemeIsHTTPOrHTTPS()) {
Mattias Nissler (ping if slow) 2014/03/25 08:31:32 So FTP is still allowed? might just want to whitel
+ *block = true;
+ return true;
+ }
+ }
+ return false;
+#elif defined(OS_IOS)
return false;
#else
static const char kServiceLoginAuth[] = "/ServiceLoginAuth";
« no previous file with comments | « chrome/browser/policy/policy_helpers.h ('k') | chrome/browser/policy/url_blacklist_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698