chromeos: converts WindowState to aura::Window

chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc

Index: chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc
index c623a26107de9458d2e0e503a964c448fcffa968..501fc6419610e560dd80f92aa8f4edb95dbbe73a 100644
--- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc
+++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc
@@ -19,7 +19,6 @@
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_state_delegate.h"
 #include "ash/wm/window_state_observer.h"
-#include "ash/wm_window.h"
 #include "chrome/browser/chromeos/note_taking_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/ash/ash_util.h"
@@ -60,13 +59,12 @@ class NativeAppWindowStateDelegate : public ash::wm::WindowStateDelegate,
     // control.
     // TODO(pkotwicz): This is a hack. Remove ASAP. http://crbug.com/319048
     window_state_->AddObserver(this);
-    ash::WmWindow::GetAuraWindow(window_state_->window())->AddObserver(this);
+    window_state_->window()->AddObserver(this);
   }
   ~NativeAppWindowStateDelegate() override {
     if (window_state_) {
       window_state_->RemoveObserver(this);
-      ash::WmWindow::GetAuraWindow(window_state_->window())
-          ->RemoveObserver(this);
+      window_state_->window()->RemoveObserver(this);
     }
   }
 
@@ -108,8 +106,8 @@ class NativeAppWindowStateDelegate : public ash::wm::WindowStateDelegate,
   // Overridden from aura::WindowObserver:
   void OnWindowDestroying(aura::Window* window) override {
     window_state_->RemoveObserver(this);
-    ash::WmWindow::GetAuraWindow(window_state_->window())->RemoveObserver(this);
-    window_state_ = NULL;
+    window_state_->window()->RemoveObserver(this);
+    window_state_ = nullptr;
   }
 
   // Not owned.