Add mash shelf application id support.

chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.h"
 
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
 #include "chrome/grit/theme_resources.h"
 #include "content/public/common/mojo_shell_connection.h"
@@ skipping 56 matching lines @@
   int64_t display_id = gfx::Screen::GetScreen()->GetPrimaryDisplay().id();
   shelf_controller_->SetAlignment(static_cast<mash::shelf::mojom::Alignment>(
       ash::GetShelfAlignmentPref(profile->GetPrefs(), display_id)));
   shelf_controller_->SetAutoHideBehavior(
       static_cast<mash::shelf::mojom::AutoHideBehavior>(
           ash::GetShelfAutoHideBehaviorPref(profile->GetPrefs(), display_id)));
 
   // 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)));
 
   // Start observing the shelf now that it has been initialized.
   mash::shelf::mojom::ShelfObserverAssociatedPtrInfo ptr_info;
   observer_binding_.Bind(&ptr_info, shelf_controller_.associated_group());
   shelf_controller_->AddObserver(std::move(ptr_info));
 }
 
 void ChromeMashShelfController::OnAlignmentChanged(
     mash::shelf::mojom::Alignment alignment) {
   ash::SetShelfAlignmentPref(ProfileManager::GetActiveUserProfile()->GetPrefs(),
                              gfx::Screen::GetScreen()->GetPrimaryDisplay().id(),
                              static_cast<ash::ShelfAlignment>(alignment));
 }
 
 void ChromeMashShelfController::OnAutoHideBehaviorChanged(
     mash::shelf::mojom::AutoHideBehavior auto_hide) {
   ash::SetShelfAutoHideBehaviorPref(
       ProfileManager::GetActiveUserProfile()->GetPrefs(),
       gfx::Screen::GetScreen()->GetPrimaryDisplay().id(),
       static_cast<ash::ShelfAutoHideBehavior>(auto_hide));
 }