Chromium Code Reviews| 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"; |