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

Unified Diff: ash/display/window_tree_host_manager_unittest.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/display/screen_position_controller.cc ('k') | ash/drag_drop/drag_drop_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/window_tree_host_manager_unittest.cc
diff --git a/ash/display/window_tree_host_manager_unittest.cc b/ash/display/window_tree_host_manager_unittest.cc
index 3148c23a4fa564d7a2a71c1dbddb37bc5ccc24e9..49c4095e7593ad84424c602ca5a272546afb3eb4 100644
--- a/ash/display/window_tree_host_manager_unittest.cc
+++ b/ash/display/window_tree_host_manager_unittest.cc
@@ -6,13 +6,13 @@
#include <memory>
-#include "ash/aura/wm_window_aura.h"
#include "ash/common/material_design/material_design_controller.h"
#include "ash/common/shelf/shelf_widget.h"
#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/wm/window_state.h"
#include "ash/common/wm/wm_event.h"
#include "ash/common/wm/wm_screen_util.h"
+#include "ash/common/wm_window.h"
#include "ash/display/display_util.h"
#include "ash/screen_util.h"
#include "ash/shell.h"
@@ -1568,7 +1568,7 @@ class RootWindowTestObserver : public aura::WindowObserver {
const gfx::Rect& old_bounds,
const gfx::Rect& new_bounds) override {
shelf_display_bounds_ =
- wm::GetDisplayBoundsWithShelf(WmWindowAura::Get(window));
+ wm::GetDisplayBoundsWithShelf(WmWindow::Get(window));
}
const gfx::Rect& shelf_display_bounds() const {
« no previous file with comments | « ash/display/screen_position_controller.cc ('k') | ash/drag_drop/drag_drop_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698