wm: public window_types.

ash/shell/window_watcher_shelf_item_delegate.cc

Index: ash/shell/window_watcher_shelf_item_delegate.cc
diff --git a/ash/shell/window_watcher_shelf_item_delegate.cc b/ash/shell/window_watcher_shelf_item_delegate.cc
index ecb4308c944db9b9b7f16f2858e7b3a7f668a170..fd8be8e40f263dacf2b18d1ae0453822f7f7ae92 100644
--- a/ash/shell/window_watcher_shelf_item_delegate.cc
+++ b/ash/shell/window_watcher_shelf_item_delegate.cc
@@ -24,7 +24,7 @@ WindowWatcherShelfItemDelegate::~WindowWatcherShelfItemDelegate() {
 
 bool WindowWatcherShelfItemDelegate::ItemSelected(const ui::Event& event) {
   aura::Window* window = watcher_->GetWindowByID(id_);
-  if (window->type() == aura::client::WINDOW_TYPE_PANEL)
+  if (window->type() == ui::wm::WINDOW_TYPE_PANEL)

[Ben Goodger (Google), 2013/12/18 06:08:12]

how about just "wm::"

?

[tfarina, 2013/12/18 12:45:49]

Initially I went with just "wm::", but it caused conflicts in ash, because in
ash there is already a "namespace wm", so I had to use ::wm, but then that was
an error in a template class.

     wm::MoveWindowToEventRoot(window, event);
   window->Show();
   wm::ActivateWindow(window);