wm: public window_types.

ash/accelerators/accelerator_controller.cc

 // Copyright (c) 2012 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/accelerators/accelerator_controller.h"
 
 #include <algorithm>
 #include <cmath>
 #include <iostream>
 #include <string>
@@ skipping 562 matching lines @@
 bool HandleToggleRootWindowFullScreen() {
   Shell::GetPrimaryRootWindow()->GetDispatcher()->host()->ToggleFullScreen();
   return true;
 }
 
 bool HandleWindowSnap(int action) {
   wm::WindowState* window_state = wm::GetActiveWindowState();
   // Disable window snapping shortcut key for full screen window due to
   // http://crbug.com/135487.
   if (!window_state ||
-      window_state->window()->type() != aura::client::WINDOW_TYPE_NORMAL ||
+      window_state->window()->type() != ui::wm::WINDOW_TYPE_NORMAL ||
       window_state->IsFullscreen()) {
     return false;
   }
 
   if (action == WINDOW_SNAP_LEFT) {
     content::RecordAction(UserMetricsAction("Accel_Window_Snap_Left"));
   } else {
     content::RecordAction(UserMetricsAction("Accel_Window_Snap_Right"));
   }
 
@@ skipping 612 matching lines @@
     keyboard_brightness_control_delegate) {
   keyboard_brightness_control_delegate_ =
       keyboard_brightness_control_delegate.Pass();
 }
 
 bool AcceleratorController::CanHandleAccelerators() const {
   return true;
 }
 
 }  // namespace ash