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

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

Issue 2684853002: Discard pinning an app with non-empty launcher id. (Closed)
Patch Set: Created 3 years, 10 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_mus.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.cc
index e51e737c3f95dbfa094af909b744ddaf9b15db09..2692ed567438ff45b87b0b49bd63312df23a9e5e 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.cc
@@ -273,13 +273,11 @@ void ChromeLauncherControllerMus::PinAppsFromPrefs() {
if (!ConnectToShelfController())
return;
- std::vector<ash::launcher::AppLauncherId> pinned_apps =
- ash::launcher::GetPinnedAppsFromPrefs(profile()->GetPrefs(),
- launcher_controller_helper());
+ std::vector<std::string> pinned_apps = ash::launcher::GetPinnedAppsFromPrefs(
+ profile()->GetPrefs(), launcher_controller_helper());
- for (const auto& app_launcher_id : pinned_apps) {
- const std::string app_id = app_launcher_id.app_id();
- if (app_launcher_id.ToString() == ash::launcher::kPinnedAppsPlaceholder)
+ for (const auto& app_id : pinned_apps) {
+ if (app_id == ash::launcher::kPinnedAppsPlaceholder)
continue;
ash::mojom::ShelfItemPtr item(ash::mojom::ShelfItem::New());

Powered by Google App Engine
This is Rietveld 408576698