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

Unified Diff: ash/wm/stacking_controller.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/screen_pinning_controller_unittest.cc ('k') | ash/wm/system_gesture_event_filter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/stacking_controller.cc
diff --git a/ash/wm/stacking_controller.cc b/ash/wm/stacking_controller.cc
index b730d619c3e7f98f43ee57904eafa6103fb45393..723265d0dd13012175f31cab1440c55fd43c10fb 100644
--- a/ash/wm/stacking_controller.cc
+++ b/ash/wm/stacking_controller.cc
@@ -4,8 +4,8 @@
#include "ash/wm/stacking_controller.h"
-#include "ash/aura/wm_window_aura.h"
#include "ash/common/wm/container_finder.h"
+#include "ash/common/wm_window.h"
namespace ash {
@@ -22,8 +22,8 @@ StackingController::~StackingController() {}
aura::Window* StackingController::GetDefaultParent(aura::Window* context,
aura::Window* window,
const gfx::Rect& bounds) {
- return WmWindowAura::GetAuraWindow(wm::GetDefaultParent(
- WmWindowAura::Get(context), WmWindowAura::Get(window), bounds));
+ return WmWindow::GetAuraWindow(wm::GetDefaultParent(
+ WmWindow::Get(context), WmWindow::Get(window), bounds));
}
} // namespace ash
« no previous file with comments | « ash/wm/screen_pinning_controller_unittest.cc ('k') | ash/wm/system_gesture_event_filter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698