mash: Replace int ShelfIDs with AppLaunchID strings.

ash/shelf/shelf_widget.cc

 // Copyright 2012 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 "ash/shelf/shelf_widget.h"
 
 #include "ash/animation/animation_change_type.h"
 #include "ash/focus_cycler.h"
+#include "ash/public/cpp/window_properties.h"
 #include "ash/root_window_controller.h"
 #include "ash/session/session_controller.h"
 #include "ash/shelf/app_list_button.h"
 #include "ash/shelf/shelf_background_animator_observer.h"
 #include "ash/shelf/shelf_constants.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_view.h"
 #include "ash/shelf/wm_shelf.h"
 #include "ash/shell.h"
 #include "ash/system/status_area_layout_manager.h"
 #include "ash/system/status_area_widget.h"
-#include "ash/wm/window_properties.h"
 #include "ash/wm_window.h"
 #include "base/memory/ptr_util.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/skbitmap_operations.h"
 #include "ui/views/accessible_pane_view.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
@@ skipping 261 matching lines @@
     background_animator_.RemoveObserver(status_area_widget_);
     Shell::Get()->focus_cycler()->RemoveWidget(status_area_widget_);
     status_area_widget_->Shutdown();
     status_area_widget_ = nullptr;
   }
 
   CloseNow();
 }
 
 void ShelfWidget::UpdateIconPositionForPanel(WmWindow* panel) {
-  if (!shelf_view_)
+  ShelfID* id = panel->aura_window()->GetProperty(kShelfIDKey);
+  if (!shelf_view_ || !id)
     return;
 
   WmWindow* shelf_window = WmWindow::Get(this->GetNativeWindow());
   shelf_view_->UpdatePanelIconPosition(
-      panel->aura_window()->GetProperty(kShelfIDKey),
-      shelf_window->ConvertRectFromScreen(panel->GetBoundsInScreen())
-          .CenterPoint());
+      *id, shelf_window->ConvertRectFromScreen(panel->GetBoundsInScreen())
+               .CenterPoint());
 }
 
 gfx::Rect ShelfWidget::GetScreenBoundsOfItemIconForWindow(WmWindow* window) {
+  ShelfID* id = window->aura_window()->GetProperty(kShelfIDKey);
   // Window animations can be triggered during session restore before the shelf
   // view is created. In that case, return default empty bounds.
-  if (!shelf_view_)
+  if (!shelf_view_ || !id)
     return gfx::Rect();
 
-  ShelfID id = window->aura_window()->GetProperty(kShelfIDKey);
-  gfx::Rect bounds(shelf_view_->GetIdealBoundsOfItemIcon(id));
+  gfx::Rect bounds(shelf_view_->GetIdealBoundsOfItemIcon(*id));
   gfx::Point screen_origin;
   views::View::ConvertPointToScreen(shelf_view_, &screen_origin);
   return gfx::Rect(screen_origin.x() + bounds.x(),
                    screen_origin.y() + bounds.y(), bounds.width(),
                    bounds.height());
 }
 
 AppListButton* ShelfWidget::GetAppListButton() const {
   return shelf_view_ ? shelf_view_->GetAppListButton() : nullptr;
 }
@@ skipping 16 matching lines @@
   if (shelf_view_)
     shelf_view_->UpdateShelfItemBackground(color);
 }
 
 void ShelfWidget::WillDeleteShelfLayoutManager() {
   shelf_layout_manager_->RemoveObserver(this);
   shelf_layout_manager_ = nullptr;
 }
 
 }  // namespace ash