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

Unified Diff: chrome/browser/chromeos/arc/arc_play_store_enabled_preference_handler.cc

Issue 2791463002: mash: Remove ShelfDelegate; move functions to ShelfModel. (Closed)
Patch Set: Address comment. Created 3 years, 8 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 | « ash/test/test_shell_delegate.cc ('k') | chrome/browser/extensions/bookmark_app_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/arc/arc_play_store_enabled_preference_handler.cc
diff --git a/chrome/browser/chromeos/arc/arc_play_store_enabled_preference_handler.cc b/chrome/browser/chromeos/arc/arc_play_store_enabled_preference_handler.cc
index e5f840239585a42e1d2698a30e26626f848fa092..952e4de269be7526cb938a65cb1075d2965466ae 100644
--- a/chrome/browser/chromeos/arc/arc_play_store_enabled_preference_handler.cc
+++ b/chrome/browser/chromeos/arc/arc_play_store_enabled_preference_handler.cc
@@ -4,7 +4,7 @@
#include "chrome/browser/chromeos/arc/arc_play_store_enabled_preference_handler.h"
-#include "ash/shelf/shelf_delegate.h"
+#include "ash/shelf/shelf_model.h"
#include "ash/shell.h"
#include "base/bind.h"
#include "base/command_line.h"
@@ -93,11 +93,11 @@ void ArcPlayStoreEnabledPreferenceHandler::OnPreferenceChanged() {
// Remove the pinned Play Store icon launcher in Shelf.
// This is only for non-Managed cases. In managed cases, it is expected
// to be "disabled" rather than "removed", so keep it here.
- auto* shelf_delegate = ash::Shell::HasInstance()
- ? ash::Shell::Get()->shelf_delegate()
- : nullptr;
- if (shelf_delegate)
- shelf_delegate->UnpinAppWithID(ArcSupportHost::kHostAppId);
+ auto* shelf_model = ash::Shell::HasInstance()
+ ? ash::Shell::Get()->shelf_model()
+ : nullptr;
+ if (shelf_model)
+ shelf_model->UnpinAppWithID(ArcSupportHost::kHostAppId);
}
}
« no previous file with comments | « ash/test/test_shell_delegate.cc ('k') | chrome/browser/extensions/bookmark_app_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698