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

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

Issue 2907853002: [mus+ash] Removes WmWindow from ash/shelf and ash/shell (Closed)
Patch Set: [mus+ash] Removes WmWindow from ash/shelf and ash/shell (removed some more wm_window.h) Created 3 years, 7 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/panels/panel_frame_view.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 cec18dd2b2ec61fe0963040b20e8efe8bcb38b68..15b2efbeea51ce709a178cec7f4fcba7e995c35a 100644
--- a/ash/wm/panels/attached_panel_window_targeter.cc
+++ b/ash/wm/panels/attached_panel_window_targeter.cc
@@ -7,7 +7,6 @@
#include "ash/shelf/shelf.h"
#include "ash/shell.h"
#include "ash/wm/panels/panel_layout_manager.h"
-#include "ash/wm_window.h"
#include "ui/aura/window.h"
namespace ash {
@@ -31,17 +30,17 @@ AttachedPanelWindowTargeter::~AttachedPanelWindowTargeter() {
}
void AttachedPanelWindowTargeter::OnShelfCreatedForRootWindow(
- WmWindow* root_window) {
- UpdateTouchExtend(WmWindow::GetAuraWindow(root_window));
+ aura::Window* root_window) {
+ UpdateTouchExtend(root_window);
}
void AttachedPanelWindowTargeter::OnShelfAlignmentChanged(
- WmWindow* root_window) {
+ aura::Window* root_window) {
// Don't update the touch insets if the shelf has not yet been created.
if (!panel_layout_manager_->shelf())
return;
- UpdateTouchExtend(WmWindow::GetAuraWindow(root_window));
+ UpdateTouchExtend(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/panels/panel_frame_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698