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

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

Issue 2507073002: Split ArcSessionManager from ArcAuthService. (Closed)
Patch Set: Fix rebase mistake Created 4 years, 1 month 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/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 3333ded6e685e255987c1a8b24337fd0b215c646..44a29f23216c84d33a291a3b616c5bbaacf18bd0 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -123,7 +123,7 @@
#include "ash/shell.h" // nogncheck
#include "chrome/browser/browser_process_platform_part.h"
#include "chrome/browser/chromeos/accessibility/accessibility_util.h"
-#include "chrome/browser/chromeos/arc/arc_auth_service.h"
+#include "chrome/browser/chromeos/arc/arc_session_manager.h"
#include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.h"
#include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
#include "chrome/browser/chromeos/net/wake_on_wifi_manager.h"
@@ -1163,10 +1163,10 @@ void BrowserOptionsHandler::InitializePage() {
chromeos::WallpaperManager::Get()->IsPolicyControlled(
user->GetAccountId()));
- if (arc::ArcAuthService::IsAllowedForProfile(profile) &&
- !arc::ArcAuthService::IsOptInVerificationDisabled()) {
+ if (arc::ArcSessionManager::IsAllowedForProfile(profile) &&
+ !arc::ArcSessionManager::IsOptInVerificationDisabled()) {
base::FundamentalValue is_arc_enabled(
- arc::ArcAuthService::Get()->IsArcEnabled());
+ arc::ArcSessionManager::Get()->IsArcEnabled());
web_ui()->CallJavascriptFunctionUnsafe(
"BrowserOptions.showAndroidAppsSection",
is_arc_enabled);
@@ -2003,7 +2003,7 @@ void BrowserOptionsHandler::ShowAndroidAppsSettings(
const base::ListValue* args) {
Profile* profile = Profile::FromWebUI(web_ui());
// Settings in secondary profile cannot access ARC.
- if (!arc::ArcAuthService::IsAllowedForProfile(profile)) {
+ if (!arc::ArcSessionManager::IsAllowedForProfile(profile)) {
LOG(ERROR) << "Settings can't be invoked for non-primary profile";
return;
}
@@ -2015,7 +2015,7 @@ void BrowserOptionsHandler::ShowAccessibilityTalkBackSettings(
const base::ListValue *args) {
Profile* profile = Profile::FromWebUI(web_ui());
// Settings in secondary profile cannot access ARC.
- if (!arc::ArcAuthService::IsAllowedForProfile(profile)) {
+ if (!arc::ArcSessionManager::IsAllowedForProfile(profile)) {
LOG(WARNING) << "Settings can't be invoked for non-primary profile";
return;
}

Powered by Google App Engine
This is Rietveld 408576698