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

Unified Diff: chrome/browser/policy/url_blacklist_manager.cc

Issue 12502017: signin: pull basic SigninManager functionality into new SigninManagerBase class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix override Created 7 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/policy/url_blacklist_manager.cc
diff --git a/chrome/browser/policy/url_blacklist_manager.cc b/chrome/browser/policy/url_blacklist_manager.cc
index c99a89ea8fc017a3c6e2d772ef10d9fac5026aca..5800d257bcdb5313b9c826d11e92fec7486ab01c 100644
--- a/chrome/browser/policy/url_blacklist_manager.cc
+++ b/chrome/browser/policy/url_blacklist_manager.cc
@@ -11,7 +11,6 @@
#include "base/strings/string_number_conversions.h"
#include "base/values.h"
#include "chrome/browser/net/url_fixer_upper.h"
-#include "chrome/browser/signin/signin_manager.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/pref_names.h"
#include "components/user_prefs/pref_registry_syncable.h"
@@ -23,6 +22,10 @@
#include "net/base/load_flags.h"
#include "net/url_request/url_request.h"
+#if !defined(OS_CHROMEOS)
+#include "chrome/browser/signin/signin_manager.h"
+#endif
+
using content::BrowserThread;
using extensions::URLMatcher;
using extensions::URLMatcherCondition;
@@ -59,9 +62,11 @@ bool IsStandardScheme(const std::string& scheme) {
}
bool IsSigninFlowURL(const GURL& url) {
+#if !defined(OS_CHROMEOS)
// Whitelist all the signin flow URLs flagged by the SigninManager.
if (SigninManager::IsWebBasedSigninFlowURL(url))
return true;
+#endif
Roger Tawa OOO till Jul 10th 2013/04/05 20:53:57 Strange to ifdef out only this part. Is this func
tim (not reviewing) 2013/04/05 22:14:12 I'm not sure. CrOS still has a signin flow of its
Joao da Silva 2013/04/09 15:26:07 This function is only used in this file (it's in t
Andrew T Wilson (Slow) 2013/04/09 15:39:25 Good question. I've asked joao to check.
tim (not reviewing) 2013/04/16 03:28:29 Done.
tim (not reviewing) 2013/04/16 03:28:29 Done.
// Additionally whitelist /ServiceLoginAuth.
if (url.GetOrigin() != GURL(GaiaUrls::GetInstance()->gaia_origin_url()))

Powered by Google App Engine
This is Rietveld 408576698