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

Unified Diff: ash/wm/panels/attached_panel_window_targeter.cc

Issue 2041423003: Converts ShellObserver from aura::Window to ash::WmWindow (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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/wm/panels/attached_panel_window_targeter.h ('k') | ash/wm/screen_dimmer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/panels/attached_panel_window_targeter.cc
diff --git a/ash/wm/panels/attached_panel_window_targeter.cc b/ash/wm/panels/attached_panel_window_targeter.cc
index 2165c3a877ca8e8f2b0ac7fe6750f3cb212eeb70..65bba27980936253673748e8dbecd284168ca77f 100644
--- a/ash/wm/panels/attached_panel_window_targeter.cc
+++ b/ash/wm/panels/attached_panel_window_targeter.cc
@@ -5,6 +5,7 @@
#include "ash/wm/panels/attached_panel_window_targeter.h"
#include "ash/aura/wm_shelf_aura.h"
+#include "ash/aura/wm_window_aura.h"
#include "ash/common/wm/panels/panel_layout_manager.h"
#include "ash/shelf/shelf.h"
#include "ash/shell.h"
@@ -30,17 +31,17 @@ AttachedPanelWindowTargeter::~AttachedPanelWindowTargeter() {
}
void AttachedPanelWindowTargeter::OnShelfCreatedForRootWindow(
- aura::Window* root_window) {
- UpdateTouchExtend(root_window);
+ WmWindow* root_window) {
+ UpdateTouchExtend(WmWindowAura::GetAuraWindow(root_window));
}
void AttachedPanelWindowTargeter::OnShelfAlignmentChanged(
- aura::Window* root_window) {
+ WmWindow* root_window) {
// Don't update the touch insets if the shelf has not yet been created.
if (!panel_layout_manager_->shelf())
return;
- UpdateTouchExtend(root_window);
+ UpdateTouchExtend(WmWindowAura::GetAuraWindow(root_window));
}
void AttachedPanelWindowTargeter::UpdateTouchExtend(aura::Window* root_window) {
« no previous file with comments | « ash/wm/panels/attached_panel_window_targeter.h ('k') | ash/wm/screen_dimmer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698