OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/webui/options/browser_options_handler.h" | 5 #include "chrome/browser/ui/webui/options/browser_options_handler.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <set> | 9 #include <set> |
10 #include <utility> | 10 #include <utility> |
(...skipping 1199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1210 ->GetPolicies(policy::PolicyNamespace(policy::POLICY_DOMAIN_CHROME, | 1210 ->GetPolicies(policy::PolicyNamespace(policy::POLICY_DOMAIN_CHROME, |
1211 std::string())) | 1211 std::string())) |
1212 .Get(policy::key::kUserAvatarImage)); | 1212 .Get(policy::key::kUserAvatarImage)); |
1213 | 1213 |
1214 OnWallpaperManagedChanged( | 1214 OnWallpaperManagedChanged( |
1215 chromeos::WallpaperManager::Get()->IsPolicyControlled( | 1215 chromeos::WallpaperManager::Get()->IsPolicyControlled( |
1216 user->GetAccountId())); | 1216 user->GetAccountId())); |
1217 | 1217 |
1218 if (arc::IsArcAllowedForProfile(profile) && | 1218 if (arc::IsArcAllowedForProfile(profile) && |
1219 !arc::IsArcOptInVerificationDisabled()) { | 1219 !arc::IsArcOptInVerificationDisabled()) { |
1220 base::FundamentalValue is_arc_enabled( | 1220 base::FundamentalValue is_play_store_enabled( |
1221 arc::IsArcPlayStoreEnabledForProfile(profile)); | 1221 arc::IsArcPlayStoreEnabledForProfile(profile)); |
1222 web_ui()->CallJavascriptFunctionUnsafe( | 1222 web_ui()->CallJavascriptFunctionUnsafe( |
1223 "BrowserOptions.showAndroidAppsSection", | 1223 "BrowserOptions.showAndroidAppsSection", is_play_store_enabled); |
1224 is_arc_enabled); | |
1225 // Get the initial state of Android Settings app readiness. | 1224 // Get the initial state of Android Settings app readiness. |
1226 std::unique_ptr<ArcAppListPrefs::AppInfo> app_info = | 1225 std::unique_ptr<ArcAppListPrefs::AppInfo> app_info = |
1227 ArcAppListPrefs::Get(profile)->GetApp(arc::kSettingsAppId); | 1226 ArcAppListPrefs::Get(profile)->GetApp(arc::kSettingsAppId); |
1228 if (app_info && app_info->ready) | 1227 if (app_info && app_info->ready) |
1229 UpdateAndroidSettingsAppState(app_info->ready); | 1228 UpdateAndroidSettingsAppState(app_info->ready); |
1230 } | 1229 } |
1231 | 1230 |
1232 OnSystemTimezoneAutomaticDetectionPolicyChanged(); | 1231 OnSystemTimezoneAutomaticDetectionPolicyChanged(); |
1233 #endif | 1232 #endif |
1234 } | 1233 } |
(...skipping 1126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2361 | 2360 |
2362 bool BrowserOptionsHandler::IsDeviceOwnerProfile() { | 2361 bool BrowserOptionsHandler::IsDeviceOwnerProfile() { |
2363 #if defined(OS_CHROMEOS) | 2362 #if defined(OS_CHROMEOS) |
2364 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui())); | 2363 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui())); |
2365 #else | 2364 #else |
2366 return true; | 2365 return true; |
2367 #endif | 2366 #endif |
2368 } | 2367 } |
2369 | 2368 |
2370 } // namespace options | 2369 } // namespace options |
OLD | NEW |