mash: Replace int ShelfIDs with AppLaunchID strings.

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

 // Copyright (c) 2013 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/browser_shortcut_launcher_item_controller.h"
 
 #include <limits>
 #include <vector>
 
+#include "ash/public/cpp/window_properties.h"
 #include "ash/resources/grit/ash_resources.h"
 #include "ash/shelf/shelf_model.h"
-#include "ash/wm/window_properties.h"
 #include "ash/wm_window.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_util.h"
 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
@@ skipping 75 matching lines @@
 // If |web_contents| has not loaded, returns "New Tab".
 base::string16 GetBrowserListTitle(content::WebContents* web_contents) {
   const base::string16& title = web_contents->GetTitle();
   return title.empty() ? l10n_util::GetStringUTF16(IDS_NEW_TAB_TITLE) : title;
 }
 
 }  // namespace
 
 BrowserShortcutLauncherItemController::BrowserShortcutLauncherItemController(
     ash::ShelfModel* shelf_model)
-    : ash::ShelfItemDelegate(ash::AppLaunchId(extension_misc::kChromeAppId)),
+    : ash::ShelfItemDelegate(ash::ShelfID(extension_misc::kChromeAppId)),
       shelf_model_(shelf_model) {
   // Tag all open browser windows with the appropriate shelf id property. This
   // associates each window with the shelf item for the active web contents.
   for (auto* browser : *BrowserList::GetInstance()) {
     if (IsBrowserRepresentedInBrowserList(browser) &&
         browser->tab_strip_model()->GetActiveWebContents()) {
       SetShelfIDForBrowserWindowContents(
           browser, browser->tab_strip_model()->GetActiveWebContents());
     }
   }
@@ skipping 48 matching lines @@
   // We need to set the window ShelfID for V1 applications since they are
   // content which might change and as such change the application type.
   // The browser window may not exist in unit tests.
   if (!browser || !browser->window() || !browser->window()->GetNativeWindow() ||
       !IsBrowserFromActiveUser(browser) || IsSettingsBrowser(browser)) {
     return;
   }
 
   browser->window()->GetNativeWindow()->SetProperty(
       ash::kShelfIDKey,
-      ChromeLauncherController::instance()->GetShelfIDForWebContents(
-          web_contents));
+      new ash::ShelfID(
+          ChromeLauncherController::instance()->GetShelfIDForWebContents(
+              web_contents)));
 }
 
 void BrowserShortcutLauncherItemController::ItemSelected(
     std::unique_ptr<ui::Event> event,
     int64_t display_id,
     ash::ShelfLaunchSource source,
     const ItemSelectedCallback& callback) {
   if (event && (event->flags() & ui::EF_CONTROL_DOWN)) {
     chrome::NewEmptyWindow(ChromeLauncherController::instance()->profile());
     callback.Run(ash::SHELF_ACTION_NEW_WINDOW_CREATED, base::nullopt);
@@ skipping 163 matching lines @@
 }
 
 bool BrowserShortcutLauncherItemController::IsBrowserRepresentedInBrowserList(
     Browser* browser) {
   // Only Ash desktop browser windows for the active user are represented.
   if (!browser || !IsBrowserFromActiveUser(browser))
     return false;
 
   // v1 App popup windows with a valid app id have their own icon.
   if (browser->is_app() && browser->is_type_popup() &&
-      shelf_model_->GetShelfIDForAppID(
-          web_app::GetExtensionIdFromApplicationName(browser->app_name())) !=
-          ash::kInvalidShelfID) {
+      !shelf_model_
+           ->GetShelfIDForAppID(
+               web_app::GetExtensionIdFromApplicationName(browser->app_name()))
+           .IsNull()) {
     return false;
   }
 
   // Settings browsers have their own icon.
   if (IsSettingsBrowser(browser))
     return false;
 
   // Tabbed browser and other popup windows are all represented.
   return true;
 }
@@ skipping 26 matching lines @@
   Browser* browser = content::Source<Browser>(source).ptr();
   DCHECK(browser);
   BrowserList::BrowserVector::iterator item = std::find(
       browser_menu_items_.begin(), browser_menu_items_.end(), browser);
   DCHECK(item != browser_menu_items_.end());
   // Clear the entry for the closed browser and leave other indices intact.
   *item = nullptr;
   registrar_.Remove(this, chrome::NOTIFICATION_BROWSER_CLOSING,
                     content::Source<Browser>(browser));
 }