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

Unified Diff: chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc

Issue 2629643002: chromeos: Renames WmWindowAura to WmWindow (Closed)
Patch Set: unnecessary casts 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
Index: chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc
diff --git a/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc b/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc
index 7a80cda4fdad2968c3668f700adfb5fa8be331fb..9e0ebf65510bc01eaa71a3d239dd0b884c192a97 100644
--- a/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc
+++ b/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc
@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/aura/wm_window_aura.h"
#include "ash/common/shelf/shelf_view.h"
#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/wm_window.h"
#include "ash/shell.h"
#include "base/command_line.h"
#include "base/location.h"
@@ -54,7 +54,7 @@ void CloseBrowser(Browser* browser) {
gfx::Rect GetChromeIconBoundsForRootWindow(aura::Window* root_window) {
const ash::ShelfView* shelf_view =
- ash::WmShelf::ForWindow(ash::WmWindowAura::Get(root_window))
+ ash::WmShelf::ForWindow(ash::WmWindow::Get(root_window))
->GetShelfViewForTesting();
const views::ViewModel* view_model = shelf_view->view_model_for_test();

Powered by Google App Engine
This is Rietveld 408576698