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

Unified Diff: chrome/browser/ui/webui/settings/md_settings_ui.cc

Issue 2642783003: Move more utility functions to arc_util. (Closed)
Patch Set: Revert IsIntentHelperAvailable fix. Created 3 years, 11 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
Index: chrome/browser/ui/webui/settings/md_settings_ui.cc
diff --git a/chrome/browser/ui/webui/settings/md_settings_ui.cc b/chrome/browser/ui/webui/settings/md_settings_ui.cc
index 910ca3bc68df03d4e643bdd600e82e9953106d0e..481ba60105484e02fbfa74d63d277ceb94c6b576 100644
--- a/chrome/browser/ui/webui/settings/md_settings_ui.cc
+++ b/chrome/browser/ui/webui/settings/md_settings_ui.cc
@@ -45,7 +45,7 @@
#if defined(OS_CHROMEOS)
#include "ash/common/system/chromeos/palette/palette_utils.h"
#include "ash/common/system/chromeos/power/power_status.h"
-#include "chrome/browser/chromeos/arc/arc_session_manager.h"
+#include "chrome/browser/chromeos/arc/arc_util.h"
#include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.h"
#include "chrome/browser/ui/ash/ash_util.h"
#include "chrome/browser/ui/webui/settings/chromeos/accessibility_handler.h"
@@ -60,6 +60,7 @@
#include "chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler.h"
#include "chrome/browser/ui/webui/settings/chromeos/internet_handler.h"
#include "chrome/common/chrome_switches.h"
+#include "components/arc/arc_util.h"
#else // !defined(OS_CHROMEOS)
#include "chrome/browser/ui/webui/settings/settings_default_browser_handler.h"
#include "chrome/browser/ui/webui/settings/settings_manage_profile_handler.h"
@@ -153,10 +154,9 @@ MdSettingsUI::MdSettingsUI(content::WebUI* web_ui, const GURL& url)
html_source->AddBoolean("stylusAllowed", ash::IsPaletteFeatureEnabled());
html_source->AddBoolean("pinUnlockEnabled",
chromeos::IsPinUnlockEnabled(profile->GetPrefs()));
- html_source->AddBoolean(
- "androidAppsAllowed",
- arc::ArcSessionManager::IsAllowedForProfile(profile) &&
- !arc::ArcSessionManager::IsOptInVerificationDisabled());
+ html_source->AddBoolean("androidAppsAllowed",
+ arc::util::IsArcAllowedForProfile(profile) &&
+ !arc::util::IsOptInVerificationDisabled());
// TODO(mash): Support Chrome power settings in Mash. crbug.com/644348
bool enable_power_settings =

Powered by Google App Engine
This is Rietveld 408576698