wm: public window_types.

ash/shell/window_watcher_shelf_item_delegate.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/shell/window_watcher_shelf_item_delegate.h"
 
 #include "ash/shell/window_watcher.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/window.h"
 
 namespace ash {
 namespace shell {
 
 WindowWatcherShelfItemDelegate::WindowWatcherShelfItemDelegate(
     LauncherID id,
     WindowWatcher* watcher)
     : id_(id), watcher_(watcher) {
   DCHECK_GT(id_, 0);
   DCHECK(watcher_);
 }
 
 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);
   return false;
 }
 
 base::string16 WindowWatcherShelfItemDelegate::GetTitle() {
   return watcher_->GetWindowByID(id_)->title();
 }
 
@@ skipping 10 matching lines @@
 bool WindowWatcherShelfItemDelegate::IsDraggable() {
   return true;
 }
 
 bool WindowWatcherShelfItemDelegate::ShouldShowTooltip() {
   return true;
 }
 
 }  // namespace shell
 }  // namespace ash