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

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

Issue 927573002: Make sure key::kEnableWebBasedSignin policy also turns on command line arg (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Make code more rebust Created 5 years, 10 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 | « no previous file | components/policy/resources/policy_templates.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/policy/chrome_browser_policy_connector.cc
diff --git a/chrome/browser/policy/chrome_browser_policy_connector.cc b/chrome/browser/policy/chrome_browser_policy_connector.cc
index e39d0109b4e24c1f16602062e3bd7edb2fb98f8e..a36e06ace762f20400d936d8d4af059d1d2cdd1c 100644
--- a/chrome/browser/policy/chrome_browser_policy_connector.cc
+++ b/chrome/browser/policy/chrome_browser_policy_connector.cc
@@ -131,9 +131,13 @@ void ChromeBrowserPolicyConnector::AppendExtraFlagPerPolicy() {
chrome_policy.GetValue(key::kEnableWebBasedSignin);
bool enabled = false;
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
- if (policy_value && policy_value->GetAsBoolean(&enabled) && enabled &&
- !command_line->HasSwitch(switches::kEnableWebBasedSignin)) {
- command_line->AppendSwitch(switches::kEnableWebBasedSignin);
+ if (policy_value && policy_value->GetAsBoolean(&enabled) && enabled) {
+ if (!command_line->HasSwitch(switches::kEnableWebBasedSignin))
+ command_line->AppendSwitch(switches::kEnableWebBasedSignin);
+ // In M41, to fully enable web-based sign in, the kEnableIframeBasedSignin
+ // must also be specified.
+ if (!command_line->HasSwitch(switches::kEnableIframeBasedSignin))
+ command_line->AppendSwitch(switches::kEnableIframeBasedSignin);
}
}
« no previous file with comments | « no previous file | components/policy/resources/policy_templates.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698