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

Issues Search
    My Issues | Starred     Open | Closed | All

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: andorid->android 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
« chrome/browser/resources/options/browser_options.js ('K') | « chrome/browser/resources/options/browser_options.js ('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..29e0df8f840174eddd500177dea77d49b1ebf47a 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -1048,11 +1048,14 @@ void BrowserOptionsHandler::InitializePage() {
consumer_management->AddObserver(this);
}
- if (!arc::ArcBridgeService::GetEnabled(
- base::CommandLine::ForCurrentProcess()) ||
- arc::ArcAuthService::IsOptInVerificationDisabled()) {
- web_ui()->CallJavascriptFunction("BrowserOptions.hideAndroidAppsSection");
- }
+ web_ui()->CallJavascriptFunction(
+ "BrowserOptions.setAndroidAppsSectionAttributes",
+ base::FundamentalValue(!arc::ArcBridgeService::GetEnabled(
+ base::CommandLine::ForCurrentProcess())
+ || arc::ArcAuthService::IsOptInVerificationDisabled()),
bartfab (slow) 2016/02/16 15:23:00 Nit: Indentation.
+ base::FundamentalValue(
+ policy::ProfilePolicyConnectorFactory::GetForBrowserContext(profile)
+ ->IsManaged()));
bartfab (slow) 2016/02/16 15:23:00 Nit: Indentation.
#endif
}
« chrome/browser/resources/options/browser_options.js ('K') | « chrome/browser/resources/options/browser_options.js ('k') | chrome/test/data/policy/policy_test_cases.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698