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

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

Issue 2194353002: mash: Migrate ScopedTargetRootWindow to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: similarity 40 Created 4 years, 5 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
« ash/common/scoped_root_window_for_new_windows.h ('K') | « ash/shell.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc
diff --git a/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc b/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc
index db3850dd5560d4454265dd764bef43f691ac9a4b..6cb8e2c62deed4b8c7d52571dc616418a245bc96 100644
--- a/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc
+++ b/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "ash/aura/scoped_root_window_for_new_windows_aura.h"
#include "ash/common/wm/window_positioner.h"
#include "ash/common/wm/window_resizer.h"
#include "ash/common/wm/window_state.h"
-#include "ash/scoped_target_root_window.h"
#include "ash/screen_util.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
@@ -824,7 +824,7 @@ TEST_F(WindowSizerAshTest, DefaultBoundsInTargetDisplay) {
{
aura::Window* first_root =
ash::Shell::GetAllRootWindows()[0];
- ash::ScopedTargetRootWindow tmp(first_root);
+ ash::ScopedRootWindowForNewWindowsAura tmp(first_root);
gfx::Rect bounds;
ui::WindowShowState show_state;
WindowSizer::GetBrowserWindowBoundsAndShowState(
@@ -838,7 +838,7 @@ TEST_F(WindowSizerAshTest, DefaultBoundsInTargetDisplay) {
{
aura::Window* second_root =
ash::Shell::GetAllRootWindows()[1];
- ash::ScopedTargetRootWindow tmp(second_root);
+ ash::ScopedRootWindowForNewWindowsAura tmp(second_root);
gfx::Rect bounds;
ui::WindowShowState show_state;
WindowSizer::GetBrowserWindowBoundsAndShowState(
« ash/common/scoped_root_window_for_new_windows.h ('K') | « ash/shell.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698