Replace WmWindowObserver with aura::WindowObserver.

ash/common/wm/window_cycle_list.cc

 // Copyright 2014 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/common/wm/window_cycle_list.h"
 
 #include <list>
 #include <map>
 
 #include "ash/common/wm/mru_window_tracker.h"
@@ skipping 44 matching lines @@
  private:
   std::unique_ptr<views::Painter> painter_;
 
   DISALLOW_COPY_AND_ASSIGN(LayerFillBackgroundPainter);
 };
 
 }  // namespace
 
 // This view represents a single WmWindow by displaying a title and a thumbnail
 // of the window's contents.
-class WindowPreviewView : public views::View, public WmWindowObserver {
+class WindowPreviewView : public views::View, public aura::WindowObserver {
  public:
   explicit WindowPreviewView(WmWindow* window)
       : window_title_(new views::Label),
         preview_background_(new views::View),
         mirror_view_(window->CreateViewWithRecreatedLayers().release()),
         window_observer_(this) {
-    window_observer_.Add(window);
+    window_observer_.Add(window->aura_window());
     window_title_->SetText(window->GetTitle());
     window_title_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     window_title_->SetEnabledColor(SK_ColorWHITE);
     window_title_->SetAutoColorReadabilityEnabled(false);
     // Background is not fully opaque, so subpixel rendering won't look good.
     window_title_->SetSubpixelRenderingEnabled(false);
     // The base font is 12pt (for English) so this comes out to 14pt.
     const int kLabelSizeDelta = 2;
     window_title_->SetFontList(
         window_title_->font_list().DeriveWithSizeDelta(kLabelSizeDelta));
@@ skipping 45 matching lines @@
     preview_background_->SetVisible(true);
     preview_area_bounds.ClampToCenteredSize(mirror_view_->size());
     mirror_view_->SetPosition(preview_area_bounds.origin());
   }
 
   void GetAccessibleNodeData(ui::AXNodeData* node_data) override {
     node_data->role = ui::AX_ROLE_WINDOW;
     node_data->SetName(window_title_->text());
   }
 
-  // WmWindowObserver:
-  void OnWindowDestroying(WmWindow* window) override {
+  // aura::WindowObserver:
+  void OnWindowDestroying(aura::Window* window) override {
     window_observer_.Remove(window);
   }
 
-  void OnWindowTitleChanged(WmWindow* window) override {
+  void OnWindowTitleChanged(aura::Window* window) override {
     window_title_->SetText(window->GetTitle());
   }
 
  private:
   // The maximum width of a window preview.
   static const int kMaxPreviewWidth = 512;
   // All previews are the same height (this is achieved via a combination of
   // scaling and padding).
   static const int kFixedPreviewHeight = 256;
 
@@ skipping 39 matching lines @@
   }
 
   // Displays the title of the window above the preview.
   views::Label* window_title_;
   // When visible, shows a darkened background area behind |mirror_view_|
   // (effectively padding the preview to fit the desired bounds).
   views::View* preview_background_;
   // The view that actually renders a thumbnail version of the window.
   views::View* mirror_view_;
 
-  ScopedObserver<WmWindow, WmWindowObserver> window_observer_;
+  ScopedObserver<aura::Window, aura::WindowObserver> window_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowPreviewView);
 };
 
 // A view that shows a collection of windows the user can tab through.
 class WindowCycleView : public views::WidgetDelegateView {
  public:
   explicit WindowCycleView(const WindowCycleList::WindowList& windows)
       : mirror_container_(new views::View()),
         highlight_view_(new views::View()),
@@ skipping 165 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(WindowCycleView);
 };
 
 WindowCycleList::WindowCycleList(const WindowList& windows)
     : windows_(windows),
       screen_observer_(this) {
   if (!ShouldShowUi())
     WmShell::Get()->mru_window_tracker()->SetIgnoreActivations(true);
 
   for (WmWindow* window : windows_)
-    window->AddObserver(this);
+    window->aura_window()->AddObserver(this);
 
   if (ShouldShowUi()) {
     if (g_disable_initial_delay) {
       InitWindowCycleView();
     } else {
       show_ui_timer_.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(150),
                            this, &WindowCycleList::InitWindowCycleView);
     }
   }
 }
 
 WindowCycleList::~WindowCycleList() {
   if (!ShouldShowUi())
     WmShell::Get()->mru_window_tracker()->SetIgnoreActivations(false);
 
   for (WmWindow* window : windows_)
-    window->RemoveObserver(this);
+    window->aura_window()->RemoveObserver(this);
 
   if (!windows_.empty() && user_did_accept_) {
     WmWindow* target_window = windows_[current_index_];
     target_window->Show();
     target_window->GetWindowState()->Activate();
   }
 
   if (cycle_ui_widget_)
     cycle_ui_widget_->Close();
 
@@ skipping 43 matching lines @@
     if (cycle_view_)
       cycle_view_->SetTargetWindow(windows_[current_index_]);
   }
 }
 
 // static
 void WindowCycleList::DisableInitialDelayForTesting() {
   g_disable_initial_delay = true;
 }
 
-void WindowCycleList::OnWindowDestroying(WmWindow* window) {
+void WindowCycleList::OnWindowDestroying(aura::Window* window) {
   window->RemoveObserver(this);
 
-  WindowList::iterator i = std::find(windows_.begin(), windows_.end(), window);
+  WindowList::iterator i =
+      std::find(windows_.begin(), windows_.end(), WmWindow::Get(window));
   // TODO(oshima): Change this back to DCHECK once crbug.com/483491 is fixed.
   CHECK(i != windows_.end());
   int removed_index = static_cast<int>(i - windows_.begin());
   windows_.erase(i);
   if (current_index_ > removed_index ||
       current_index_ == static_cast<int>(windows_.size())) {
     current_index_--;
   }
 
   if (cycle_view_) {
     WmWindow* new_target_window =
         windows_.empty() ? nullptr : windows_[current_index_];
-    cycle_view_->HandleWindowDestruction(window, new_target_window);
+    cycle_view_->HandleWindowDestruction(WmWindow::Get(window),
+                                         new_target_window);
     if (windows_.empty()) {
       // This deletes us.
       WmShell::Get()->window_cycle_controller()->CancelCycling();
       return;
     }
   }
 }
 
 void WindowCycleList::OnDisplayAdded(const display::Display& new_display) {}
 
@@ skipping 43 matching lines @@
   widget_rect.set_height(widget_height);
   params.bounds = widget_rect;
   widget->Init(params);
 
   screen_observer_.Add(display::Screen::GetScreen());
   widget->Show();
   cycle_ui_widget_ = widget;
 }
 
 }  // namespace ash