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

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.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/ash/launcher/chrome_launcher_controller_impl.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc
index e731a9ac7741a9a50bb18d59fd0e33aa78234886..c05beaa42d13d4b4acc71a7cc8408e7da67be8b0 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc
@@ -29,6 +29,7 @@
#include "build/build_config.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/chromeos/arc/arc_util.h"
#include "chrome/browser/defaults.h"
#include "chrome/browser/extensions/extension_util.h"
#include "chrome/browser/prefs/incognito_mode_prefs.h"
@@ -200,7 +201,7 @@ ChromeLauncherControllerImpl::ChromeLauncherControllerImpl(
AttachProfile(profile);
model_->AddObserver(this);
- if (arc::ArcSessionManager::IsAllowedForProfile(this->profile()))
+ if (arc::util::IsArcAllowedForProfile(this->profile()))
arc_deferred_launcher_.reset(new ArcAppDeferredLauncherController(this));
// In multi profile mode we might have a window manager. We try to create it
@@ -816,7 +817,7 @@ void ChromeLauncherControllerImpl::AttachProfile(Profile* profile_to_attach) {
new LauncherExtensionAppUpdater(this, profile()));
app_updaters_.push_back(std::move(extension_app_updater));
- if (arc::ArcSessionManager::IsAllowedForProfile(profile())) {
+ if (arc::util::IsArcAllowedForProfile(profile())) {
std::unique_ptr<LauncherAppUpdater> arc_app_updater(
new LauncherArcAppUpdater(this, profile()));
app_updaters_.push_back(std::move(arc_app_updater));

Powered by Google App Engine
This is Rietveld 408576698