Removes WindowState::aura_window()

ash/wm/window_state.h

 // 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.
 
 #ifndef ASH_WM_WINDOW_STATE_H_
 #define ASH_WM_WINDOW_STATE_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
-#include "ash/wm/aura/wm_window_aura.h"
 #include "ash/wm/common/wm_types.h"
 #include "ash/wm/drag_details.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "ui/base/ui_base_types.h"
 
 namespace aura {
 class Window;
 }
@@ skipping 53 matching lines @@
     // Note: This only gets called when the state object gets changed.
     virtual void DetachState(WindowState* window_state) = 0;
 
    private:
     DISALLOW_COPY_AND_ASSIGN(State);
   };
 
   // Call GetWindowState() to instantiate this class.
   ~WindowState();
 
-  // TODO(sky): remove these. They are temporary until converted to common
-  // types.
-  aura::Window* aura_window() { return WmWindowAura::GetAuraWindow(window_); }
-  const aura::Window* aura_window() const {
-    return WmWindowAura::GetAuraWindow(window_);
-  }
-
   WmWindow* window() { return window_; }
   const WmWindow* window() const { return window_; }
 
   bool HasDelegate() const;
   void SetDelegate(std::unique_ptr<WindowStateDelegate> delegate);
 
   // Returns the window's current ash state type.
   // Refer to WindowStateType definition in wm_types.h as for why Ash
   // has its own state type.
   WindowStateType GetStateType() const;
@@ skipping 293 matching lines @@
 
   std::unique_ptr<State> current_state_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowState);
 };
 
 }  // namespace wm
 }  // namespace ash
 
 #endif  // ASH_WM_WINDOW_STATE_H_