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

Side by Side Diff: chrome/browser/policy/policy_helpers.cc

Issue 816403003: Make callers of CommandLine use it via the base:: namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 5 years, 12 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/policy/policy_helpers.h" 5 #include "chrome/browser/policy/policy_helpers.h"
6 6
7 #include "net/base/net_errors.h" 7 #include "net/base/net_errors.h"
8 #include "url/gurl.h" 8 #include "url/gurl.h"
9 9
10 #if defined(OS_CHROMEOS) 10 #if defined(OS_CHROMEOS)
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "chromeos/chromeos_switches.h" 12 #include "chromeos/chromeos_switches.h"
13 #endif 13 #endif
14 14
15 #if !defined(OS_CHROMEOS) && !defined(OS_IOS) 15 #if !defined(OS_CHROMEOS) && !defined(OS_IOS)
16 #include "components/signin/core/browser/signin_manager.h" 16 #include "components/signin/core/browser/signin_manager.h"
17 #include "google_apis/gaia/gaia_urls.h" 17 #include "google_apis/gaia/gaia_urls.h"
18 #endif 18 #endif
19 19
20 namespace policy { 20 namespace policy {
21 21
22 bool OverrideBlacklistForURL(const GURL& url, bool* block, int* reason) { 22 bool OverrideBlacklistForURL(const GURL& url, bool* block, int* reason) {
23 #if defined(OS_CHROMEOS) 23 #if defined(OS_CHROMEOS)
24 // On ChromeOS browsing is only allowed once OOBE has completed. Therefore all 24 // On ChromeOS browsing is only allowed once OOBE has completed. Therefore all
25 // requests are blocked until this condition is met. 25 // requests are blocked until this condition is met.
26 if (CommandLine::ForCurrentProcess()->HasSwitch( 26 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
27 chromeos::switches::kOobeGuestSession)) { 27 chromeos::switches::kOobeGuestSession)) {
28 if (!url.SchemeIs("chrome") && !url.SchemeIs("chrome-extension")) { 28 if (!url.SchemeIs("chrome") && !url.SchemeIs("chrome-extension")) {
29 *reason = net::ERR_BLOCKED_ENROLLMENT_CHECK_PENDING; 29 *reason = net::ERR_BLOCKED_ENROLLMENT_CHECK_PENDING;
30 *block = true; 30 *block = true;
31 return true; 31 return true;
32 } 32 }
33 } 33 }
34 return false; 34 return false;
35 #elif defined(OS_IOS) 35 #elif defined(OS_IOS)
36 return false; 36 return false;
37 #else 37 #else
38 static const char kServiceLoginAuth[] = "/ServiceLoginAuth"; 38 static const char kServiceLoginAuth[] = "/ServiceLoginAuth";
39 39
40 *block = false; 40 *block = false;
41 // Whitelist all the signin flow URLs flagged by the SigninManager. 41 // Whitelist all the signin flow URLs flagged by the SigninManager.
42 if (SigninManager::IsWebBasedSigninFlowURL(url)) 42 if (SigninManager::IsWebBasedSigninFlowURL(url))
43 return true; 43 return true;
44 44
45 // Additionally whitelist /ServiceLoginAuth. 45 // Additionally whitelist /ServiceLoginAuth.
46 if (url.GetOrigin() != GaiaUrls::GetInstance()->gaia_url().GetOrigin()) 46 if (url.GetOrigin() != GaiaUrls::GetInstance()->gaia_url().GetOrigin())
47 return false; 47 return false;
48 48
49 return url.path() == kServiceLoginAuth; 49 return url.path() == kServiceLoginAuth;
50 #endif 50 #endif
51 } 51 }
52 52
53 } // namespace policy 53 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/policy/policy_browsertest.cc ('k') | chrome/browser/predictors/autocomplete_action_predictor_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698