Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2376)

Unified Diff: ash/common/wm/overview/window_selector_item.cc

Issue 2699033002: Replace WmWindowObserver with aura::WindowObserver. (Closed)
Patch Set: Check for null images in ShelfWindowWatcher. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/wm/overview/window_selector_item.h ('k') | ash/common/wm/panels/panel_layout_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm/overview/window_selector_item.cc
diff --git a/ash/common/wm/overview/window_selector_item.cc b/ash/common/wm/overview/window_selector_item.cc
index 0d79c4ce7dc58dea3d00d73790b9380197dfc84e..2c4a1376d7ee657785a03849a3ac8f8b97aaf71d 100644
--- a/ash/common/wm/overview/window_selector_item.cc
+++ b/ash/common/wm/overview/window_selector_item.cc
@@ -417,11 +417,11 @@ WindowSelectorItem::WindowSelectorItem(WmWindow* window,
window_selector_(window_selector),
background_view_(nullptr) {
CreateWindowLabel(window->GetTitle());
- GetWindow()->AddObserver(this);
+ GetWindow()->aura_window()->AddObserver(this);
}
WindowSelectorItem::~WindowSelectorItem() {
- GetWindow()->RemoveObserver(this);
+ GetWindow()->aura_window()->RemoveObserver(this);
}
WmWindow* WindowSelectorItem::GetWindow() {
@@ -548,12 +548,12 @@ void WindowSelectorItem::ButtonPressed(views::Button* sender,
window_selector_->SelectWindow(this);
}
-void WindowSelectorItem::OnWindowDestroying(WmWindow* window) {
+void WindowSelectorItem::OnWindowDestroying(aura::Window* window) {
window->RemoveObserver(this);
transform_window_.OnWindowDestroyed();
}
-void WindowSelectorItem::OnWindowTitleChanged(WmWindow* window) {
+void WindowSelectorItem::OnWindowTitleChanged(aura::Window* window) {
// TODO(flackr): Maybe add the new title to a vector of titles so that we can
// filter any of the titles the window had while in the overview session.
label_view_->SetText(window->GetTitle());
« no previous file with comments | « ash/common/wm/overview/window_selector_item.h ('k') | ash/common/wm/panels/panel_layout_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698