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

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

Issue 2629643002: chromeos: Renames WmWindowAura to WmWindow (Closed)
Patch Set: feedback Created 3 years, 11 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/overview/window_selector_unittest.cc ('k') | ash/wm/panels/panel_layout_manager_unittest.cc » ('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 85823001d71fa5871d212970d96777ffc5c73c5f..6380b444c9803191cb85a7e7c53b2d59d3ce557a 100644
--- a/ash/wm/panels/attached_panel_window_targeter.cc
+++ b/ash/wm/panels/attached_panel_window_targeter.cc
@@ -4,10 +4,10 @@
#include "ash/wm/panels/attached_panel_window_targeter.h"
-#include "ash/aura/wm_window_aura.h"
#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/wm/panels/panel_layout_manager.h"
#include "ash/common/wm_shell.h"
+#include "ash/common/wm_window.h"
#include "ui/aura/window.h"
namespace ash {
@@ -32,7 +32,7 @@ AttachedPanelWindowTargeter::~AttachedPanelWindowTargeter() {
void AttachedPanelWindowTargeter::OnShelfCreatedForRootWindow(
WmWindow* root_window) {
- UpdateTouchExtend(WmWindowAura::GetAuraWindow(root_window));
+ UpdateTouchExtend(WmWindow::GetAuraWindow(root_window));
}
void AttachedPanelWindowTargeter::OnShelfAlignmentChanged(
@@ -41,7 +41,7 @@ void AttachedPanelWindowTargeter::OnShelfAlignmentChanged(
if (!panel_layout_manager_->shelf())
return;
- UpdateTouchExtend(WmWindowAura::GetAuraWindow(root_window));
+ UpdateTouchExtend(WmWindow::GetAuraWindow(root_window));
}
void AttachedPanelWindowTargeter::UpdateTouchExtend(aura::Window* root_window) {
« no previous file with comments | « ash/wm/overview/window_selector_unittest.cc ('k') | ash/wm/panels/panel_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698