Start the move of launcher_types.h to shelf.

ash/shelf/shelf_window_watcher.cc

 // Copyright 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 "ash/shelf/shelf_window_watcher.h"
 
 #include "ash/display/display_controller.h"
+#include "ash/shelf/shelf_constants.h"
 #include "ash/shelf/shelf_item_delegate_manager.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/shelf/shelf_window_watcher_item_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/window.h"
@@ skipping 10 matching lines @@
   item->type = details.type;
   if (details.image_resource_id != ash::kInvalidImageResourceID) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     item->image = *rb.GetImageSkiaNamed(details.image_resource_id);
   }
 }
 
 // Returns true if |window| has a LauncherItem added by ShelfWindowWatcher.
 bool HasLauncherItemForWindow(aura::Window* window) {
   if (ash::GetLauncherItemDetailsForWindow(window) != NULL &&
-      ash::GetLauncherIDForWindow(window) != ash::kInvalidLauncherID)
+      ash::GetLauncherIDForWindow(window) != ash::kInvalidShelfID)
     return true;
   return false;
 }
 
 }  // namespace
 
 namespace ash {
 namespace internal {
 
 ShelfWindowWatcher::RootWindowObserver::RootWindowObserver(
@@ skipping 42 matching lines @@
   SetLauncherIDForWindow(id, window);
   scoped_ptr<ShelfItemDelegate> item_delegate(
       new ShelfWindowWatcherItemDelegate(window));
   // |item_delegate| is owned by |item_delegate_manager_|.
   item_delegate_manager_->SetShelfItemDelegate(id, item_delegate.Pass());
   model_->Add(item);
 }
 
 void ShelfWindowWatcher::RemoveLauncherItem(aura::Window* window) {
   model_->RemoveItemAt(model_->ItemIndexByID(GetLauncherIDForWindow(window)));
-  SetLauncherIDForWindow(kInvalidLauncherID, window);
+  SetLauncherIDForWindow(kInvalidShelfID, window);
 }
 
 void ShelfWindowWatcher::OnRootWindowAdded(aura::Window* root_window) {
   // |observed_activation_clients_| can have the same ActivationClient multiple
   // times - which would be handled by the |observed_activation_clients_|.
   observed_activation_clients_.Add(
       aura::client::GetActivationClient(root_window));
   observed_root_windows_.Add(root_window);
 
   aura::Window* default_container = Shell::GetContainer(
@@ skipping 31 matching lines @@
     UpdateLauncherItemStatus(gained_active, true);
   if (lost_active && HasLauncherItemForWindow(lost_active))
     UpdateLauncherItemStatus(lost_active, false);
 }
 
 void ShelfWindowWatcher::OnWindowAdded(aura::Window* window) {
   observed_windows_.Add(window);
   // Add LauncherItem if |window| already has a LauncherItemDetails when it is
   // created. Don't make a new LauncherItem for the re-parented |window| that
   // already has a LauncherItem.
-  if (GetLauncherIDForWindow(window) == ash::kInvalidLauncherID &&
+  if (GetLauncherIDForWindow(window) == ash::kInvalidShelfID &&
       GetLauncherItemDetailsForWindow(window))
     AddLauncherItem(window);
 }
 
 void ShelfWindowWatcher::OnWillRemoveWindow(aura::Window* window) {
   // Remove a child window of default container and its item if it has.
   if (observed_windows_.IsObserving(window))
     observed_windows_.Remove(window);
 
   if (HasLauncherItemForWindow(window))
@@ skipping 51 matching lines @@
 
 void ShelfWindowWatcher::OnDisplayRemoved(const gfx::Display& old_display) {
   // When this is called, RootWindow of |old_display| is already removed.
   // Instead, we remove an observer from RootWindow and ActivationClient in the
   // OnRootWindowDestroyed().
   // Do nothing here.
 }
 
 }  // namespace internal
 }  // namespace ash