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

Unified Diff: chrome/browser/ui/ash/launcher/arc_playstore_shortcut_launcher_item_controller.cc

Issue 2349313002: [Merge-M53] arc: Fix Drag&Drop for PlayStore item from App List to Shelf. (Closed)
Patch Set: Created 4 years, 3 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
« no previous file with comments | « no previous file | chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/launcher/arc_playstore_shortcut_launcher_item_controller.cc
diff --git a/chrome/browser/ui/ash/launcher/arc_playstore_shortcut_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/arc_playstore_shortcut_launcher_item_controller.cc
index d123de095c84ff9aaa3538fb5e25f33f93a0d40a..f4996fecba7a43e0bd301dc049253fb3b1a7e2b8 100644
--- a/chrome/browser/ui/ash/launcher/arc_playstore_shortcut_launcher_item_controller.cc
+++ b/chrome/browser/ui/ash/launcher/arc_playstore_shortcut_launcher_item_controller.cc
@@ -29,10 +29,11 @@ ArcPlaystoreShortcutLauncherItemController::Activate(ash::LaunchSource source) {
DCHECK(arc_app_prefs);
DCHECK(auth_service->IsAllowed());
+ const bool arc_was_enabled = auth_service->IsArcEnabled();
auth_service->EnableArc();
// Deferred launcher.
- if (arc_app_prefs->IsRegistered(arc::kPlayStoreAppId)) {
+ if (arc_app_prefs->IsRegistered(arc::kPlayStoreAppId) && arc_was_enabled) {
// Known apps can be launched directly or deferred.
arc::LaunchApp(controller()->GetProfile(), arc::kPlayStoreAppId, true);
} else {
« no previous file with comments | « no previous file | chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698