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

Side by Side Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 1922143002: Disabled ARC for ephemeral users. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressed comments Created 4 years, 7 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 unified diff | Download patch
OLDNEW
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 10
(...skipping 1073 matching lines...) Expand 10 before | Expand all | Expand 10 after
1084 g_browser_process->platform_part()->browser_policy_connector_chromeos()-> 1084 g_browser_process->platform_part()->browser_policy_connector_chromeos()->
1085 GetConsumerManagementService(); 1085 GetConsumerManagementService();
1086 if (consumer_management) { 1086 if (consumer_management) {
1087 OnConsumerManagementStatusChanged(); 1087 OnConsumerManagementStatusChanged();
1088 consumer_management->AddObserver(this); 1088 consumer_management->AddObserver(this);
1089 } 1089 }
1090 1090
1091 if (arc::ArcBridgeService::GetEnabled( 1091 if (arc::ArcBridgeService::GetEnabled(
1092 base::CommandLine::ForCurrentProcess()) && 1092 base::CommandLine::ForCurrentProcess()) &&
1093 !arc::ArcAuthService::IsOptInVerificationDisabled() && 1093 !arc::ArcAuthService::IsOptInVerificationDisabled() &&
1094 !profile->IsLegacySupervised() && 1094 !profile->IsLegacySupervised() && user->HasGaiaAccount() &&
1095 user->HasGaiaAccount()) { 1095 !user_manager::UserManager::Get()
1096 ->IsCurrentUserCryptohomeDataEphemeral()) {
1096 web_ui()->CallJavascriptFunction("BrowserOptions.showAndroidAppsSection"); 1097 web_ui()->CallJavascriptFunction("BrowserOptions.showAndroidAppsSection");
1097 } 1098 }
1098 OnSystemTimezoneAutomaticDetectionPolicyChanged(); 1099 OnSystemTimezoneAutomaticDetectionPolicyChanged();
1099 #endif 1100 #endif
1100 } 1101 }
1101 1102
1102 bool BrowserOptionsHandler::ShouldShowSetDefaultBrowser() { 1103 bool BrowserOptionsHandler::ShouldShowSetDefaultBrowser() {
1103 #if defined(OS_CHROMEOS) 1104 #if defined(OS_CHROMEOS)
1104 // We're always the default browser on ChromeOS. 1105 // We're always the default browser on ChromeOS.
1105 return false; 1106 return false;
(...skipping 1064 matching lines...) Expand 10 before | Expand all | Expand 10 after
2170 2171
2171 bool BrowserOptionsHandler::IsDeviceOwnerProfile() { 2172 bool BrowserOptionsHandler::IsDeviceOwnerProfile() {
2172 #if defined(OS_CHROMEOS) 2173 #if defined(OS_CHROMEOS)
2173 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui())); 2174 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui()));
2174 #else 2175 #else
2175 return true; 2176 return true;
2176 #endif 2177 #endif
2177 } 2178 }
2178 2179
2179 } // namespace options 2180 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/users/fake_chrome_user_manager.cc ('k') | components/user_manager/fake_user_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698