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

Unified Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 1684063002: Add ArcEnabled policy implementation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@26869593
Patch Set: Created 4 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 | « chrome/browser/policy/policy_browsertest.cc ('k') | chrome/test/data/policy/policy_test_cases.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options/browser_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index a9045fff5b0b8ab7fbd54011913c56e0dbdfe3bf..aefd4d9474ab096418e67ad04a7801b0b0abd9f7 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -1048,7 +1048,9 @@ void BrowserOptionsHandler::InitializePage() {
consumer_management->AddObserver(this);
}
- if (!arc::ArcBridgeService::GetEnabled(
+ if (policy::ProfilePolicyConnectorFactory::GetForBrowserContext(profile)
Thiemo Nagel 2016/02/12 17:32:08 Wouldn't that hide the ARC checkbox for all manage
Polina Bondarenko 2016/02/12 17:45:00 Do you mean that if ARC is enabled by policy, then
Thiemo Nagel 2016/02/12 17:53:32 Yes, sure. But in that case the checkbox shouldn'
+ ->IsManaged() ||
+ !arc::ArcBridgeService::GetEnabled(
base::CommandLine::ForCurrentProcess()) ||
arc::ArcAuthService::IsOptInVerificationDisabled()) {
web_ui()->CallJavascriptFunction("BrowserOptions.hideAndroidAppsSection");
« no previous file with comments | « chrome/browser/policy/policy_browsertest.cc ('k') | chrome/test/data/policy/policy_test_cases.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698