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

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

Issue 872433006: Disconnect one click sign in code. The code itself will be removed in followup (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix merge 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
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 e233a87584d5ac6556cc9090c82d3f48e5cdc302..c171406a0cfb56908a142395abf5ec6e2225c520 100644
--- a/chrome/browser/policy/chrome_browser_policy_connector.cc
+++ b/chrome/browser/policy/chrome_browser_policy_connector.cc
@@ -23,7 +23,6 @@
#include "components/policy/core/common/policy_namespace.h"
#include "components/policy/core/common/policy_service.h"
#include "components/policy/core/common/policy_types.h"
-#include "components/signin/core/common/signin_switches.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/common/content_switches.h"
#include "net/url_request/url_request_context_getter.h"
@@ -89,8 +88,6 @@ void ChromeBrowserPolicyConnector::Init(
BrowserPolicyConnector::Init(
local_state, request_context, device_management_service.Pass());
-
- AppendExtraFlagsPerPolicy();
}
ConfigurationPolicyProvider*
@@ -128,18 +125,7 @@ void ChromeBrowserPolicyConnector::AppendExtraFlagsPerPolicy() {
PolicyService* policy_service = GetPolicyService();
PolicyNamespace chrome_ns = PolicyNamespace(POLICY_DOMAIN_CHROME, "");
const PolicyMap& chrome_policy = policy_service->GetPolicies(chrome_ns);
- const base::Value* policy_value =
- chrome_policy.GetValue(key::kEnableDeprecatedWebBasedSignin);
- bool enabled = false;
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
- 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);
- }
if (command_line->HasSwitch(switches::kEnableNpapi))
return;
« no previous file with comments | « chrome/browser/policy/chrome_browser_policy_connector.h ('k') | chrome/browser/signin/chrome_signin_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698