wm: public window_types.

ash/wm/overview/window_selector.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/wm/overview/window_selector.h"
 
 #include <algorithm>
 
 #include "ash/ash_switches.h"
 #include "ash/root_window_controller.h"
@@ skipping 257 matching lines @@
   if (restore_focus_window_)
     restore_focus_window_->AddObserver(this);
 
   std::vector<WindowSelectorPanels*> panels_items;
   for (size_t i = 0; i < windows.size(); ++i) {
     WindowSelectorItem* item = NULL;
     if (windows[i] != restore_focus_window_)
       windows[i]->AddObserver(this);
     observed_windows_.insert(windows[i]);
 
-    if (windows[i]->type() == aura::client::WINDOW_TYPE_PANEL &&
+    if (windows[i]->type() == ui::wm::WINDOW_TYPE_PANEL &&
         wm::GetWindowState(windows[i])->panel_attached()) {
       // Attached panel windows are grouped into a single overview item per
       // root window (display).
       std::vector<WindowSelectorPanels*>::iterator iter =
           std::find_if(panels_items.begin(), panels_items.end(),
                        WindowSelectorItemForRoot(windows[i]->GetRootWindow()));
       WindowSelectorPanels* panels_item = NULL;
       if (iter == panels_items.end()) {
         panels_item = new WindowSelectorPanels();
         panels_items.push_back(panels_item);
@@ skipping 97 matching lines @@
   // ended.
   (*iter)->RestoreWindowOnExit(window);
   delegate_->OnWindowSelected(window);
 }
 
 void WindowSelector::CancelSelection() {
   delegate_->OnSelectionCanceled();
 }
 
 void WindowSelector::OnWindowAdded(aura::Window* new_window) {
-  if (new_window->type() != aura::client::WINDOW_TYPE_NORMAL &&
-      new_window->type() != aura::client::WINDOW_TYPE_PANEL) {
+  if (new_window->type() != ui::wm::WINDOW_TYPE_NORMAL &&
+      new_window->type() != ui::wm::WINDOW_TYPE_PANEL) {
     return;
   }
 
   for (size_t i = 0; i < kSwitchableWindowContainerIdsLength; ++i) {
     if (new_window->parent()->id() == kSwitchableWindowContainerIds[i] &&
         !new_window->transient_parent()) {
       // The new window is in one of the switchable containers, abort overview.
       CancelSelection();
       return;
     }
@@ skipping 104 matching lines @@
   // If the window is in the observed_windows_ list it needs to continue to be
   // observed.
   if (observed_windows_.find(restore_focus_window_) ==
           observed_windows_.end()) {
     restore_focus_window_->RemoveObserver(this);
   }
   restore_focus_window_ = NULL;
 }
 
 }  // namespace ash