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

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

Issue 2541923002: MD Settings: Add Google Play Store (Arc++) section (Closed)
Patch Set: Fix tests Created 4 years 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 e8764b2b0ae1b9acdda6a4377224287e7da7c8e9..51c7a5d29c835b0c1e8594b78c0f540b9e4c258a 100644
--- a/chrome/browser/ui/webui/settings/md_settings_ui.cc
+++ b/chrome/browser/ui/webui/settings/md_settings_ui.cc
@@ -42,8 +42,10 @@
#if defined(OS_CHROMEOS)
#include "ash/common/system/chromeos/palette/palette_utils.h"
+#include "chrome/browser/chromeos/arc/arc_session_manager.h"
#include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.h"
#include "chrome/browser/ui/webui/settings/chromeos/accessibility_handler.h"
+#include "chrome/browser/ui/webui/settings/chromeos/android_apps_handler.h"
#include "chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h"
#include "chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.h"
#include "chrome/browser/ui/webui/settings/chromeos/date_time_handler.h"
@@ -102,6 +104,7 @@ MdSettingsUI::MdSettingsUI(content::WebUI* web_ui, const GURL& url)
#if defined(OS_CHROMEOS)
AddSettingsPageUIHandler(new chromeos::settings::AccessibilityHandler(
web_ui));
+ AddSettingsPageUIHandler(new chromeos::settings::AndroidAppsHandler(profile));
AddSettingsPageUIHandler(new chromeos::settings::ChangePictureHandler());
AddSettingsPageUIHandler(new chromeos::settings::CupsPrintersHandler(web_ui));
AddSettingsPageUIHandler(new chromeos::settings::KeyboardHandler(web_ui));
@@ -135,6 +138,10 @@ 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());
#endif
AddSettingsPageUIHandler(AboutHandler::Create(html_source, profile));
« no previous file with comments | « chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc ('k') | chrome/common/url_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698