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

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

Issue 1899323002: Add mash shelf application id support. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync and rebase. Created 4 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
Index: chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.cc b/chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.cc
index 1a813c6f1ff5d4a2452a4f205ed4a5ff1874745a..c71e3067ff2e4beb608f0b6defe4b8ac29783be2 100644
--- a/chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.cc
@@ -74,14 +74,14 @@ void ChromeMashShelfController::Init() {
// Create a test shortcut item to a fake application.
mash::shelf::mojom::ShelfItemPtr item(mash::shelf::mojom::ShelfItem::New());
std::string item_id("mojo:fake_app");
- item->id = item_id;
- item->title = "Fake Mojo App (test pinned shelf item)";
+ item->app_id = item_id;
+ item->app_title = "Fake Mojo App (test pinned shelf item)";
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
const gfx::Image& image = rb.GetImageNamed(IDR_PRODUCT_LOGO_32);
item->image = skia::mojom::Bitmap::From(*image.ToSkBitmap());
std::unique_ptr<ChromeShelfItemDelegate> delegate(
new ChromeShelfItemDelegate());
- shelf_controller_->AddItem(std::move(item),
+ shelf_controller_->PinItem(std::move(item),
delegate->CreateInterfacePtrInfoAndBind(
shelf_controller_.associated_group()));
app_id_to_item_delegate_.insert(std::make_pair(item_id, std::move(delegate)));

Powered by Google App Engine
This is Rietveld 408576698