Renames LauncherID, LauncherItem and LauncherItems...
to ShelfID, ShelfItem and ShelfItems.
BUG=248353
TEST=None
[email protected],[email protected]
Review URL: https://codereview.chromium.org/152223002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248619 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/ash/shell/window_watcher.cc b/ash/shell/window_watcher.cc
index 607719a..c2244e20 100644
--- a/ash/shell/window_watcher.cc
+++ b/ash/shell/window_watcher.cc
@@ -86,7 +86,7 @@
}
}
-aura::Window* WindowWatcher::GetWindowByID(ash::LauncherID id) {
+aura::Window* WindowWatcher::GetWindowByID(ash::ShelfID id) {
IDToWindow::const_iterator i = id_to_window_.find(id);
return i != id_to_window_.end() ? i->second : NULL;
}
@@ -99,11 +99,11 @@
static int image_count = 0;
ShelfModel* model = Shell::GetInstance()->shelf_model();
- LauncherItem item;
+ ShelfItem item;
item.type = new_window->type() == ui::wm::WINDOW_TYPE_PANEL
? ash::TYPE_APP_PANEL
: ash::TYPE_PLATFORM_APP;
- ash::LauncherID id = model->next_id();
+ ash::ShelfID id = model->next_id();
id_to_window_[id] = new_window;
SkBitmap icon_bitmap;
@@ -123,7 +123,7 @@
scoped_ptr<ShelfItemDelegate> delegate(
new WindowWatcherShelfItemDelegate(id, this));
manager->SetShelfItemDelegate(id, delegate.Pass());
- SetLauncherIDForWindow(id, new_window);
+ SetShelfIDForWindow(id, new_window);
}
void WindowWatcher::OnWillRemoveWindow(aura::Window* window) {
