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

Unified Diff: chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_manager.cc

Issue 2648213004: Migrate --enable-arc and --arc-available part 1. (Closed)
Patch Set: 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/chromeos/app_mode/arc/arc_kiosk_app_manager.cc
diff --git a/chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_manager.cc b/chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_manager.cc
index e1f0ea22f27d1cd89f739f9127b1f611e006c50e..10f4bc1241152ead8d648d62eaa0924312c395dd 100644
--- a/chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_manager.cc
+++ b/chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_manager.cc
@@ -11,7 +11,6 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/callback.h"
-#include "base/command_line.h"
#include "base/logging.h"
#include "base/values.h"
#include "chrome/browser/browser_process.h"
@@ -21,7 +20,7 @@
#include "chromeos/dbus/cryptohome_client.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/settings/cros_settings_names.h"
-#include "components/arc/arc_bridge_service.h"
+#include "components/arc/arc_util.h"
#include "components/prefs/pref_registry_simple.h"
#include "components/prefs/pref_service.h"
#include "components/prefs/scoped_user_pref_update.h"
@@ -174,8 +173,7 @@ void ArcKioskAppManager::RemoveObserver(ArcKioskAppManagerObserver* observer) {
void ArcKioskAppManager::UpdateApps() {
// Do not populate ARC kiosk apps if ARC apps can't be run on the device.
// Apps won't be added to kiosk Apps menu and won't be auto-launched.
- if (!arc::ArcBridgeService::GetEnabled(
- base::CommandLine::ForCurrentProcess())) {
+ if (!arc::IsArcAvailable()) {
VLOG(1) << "Device doesn't support ARC apps, don't populate ARC kiosk apps";
return;
}
« no previous file with comments | « no previous file | chrome/browser/chromeos/arc/arc_session_manager.h » ('j') | chrome/browser/chromeos/arc/arc_session_manager.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698