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

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

Issue 2691043002: 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 766cffdeb9e3b3754444ed052f7e9bd4db49128e..abcb8b20da686a71ca9e8eb5bfddebe8776dbca6 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.cc
@@ -8,6 +8,7 @@
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/ui/ash/app_launcher_id.h"
#include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
#include "chrome/browser/ui/ash/launcher/launcher_controller_helper.h"
#include "extensions/grit/extensions_browser_resources.h"
@@ -281,7 +282,7 @@ void ChromeLauncherControllerMus::PinAppsFromPrefs() {
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)
+ if (app_launcher_id.app_id() == ash::launcher::kPinnedAppsPlaceholder)
continue;
ash::mojom::ShelfItemPtr item(ash::mojom::ShelfItem::New());

Powered by Google App Engine
This is Rietveld 408576698