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

Unified Diff: ash/wm/base_layout_manager_unittest.cc

Issue 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix other os's Created 8 years, 2 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: ash/wm/base_layout_manager_unittest.cc
diff --git a/ash/wm/base_layout_manager_unittest.cc b/ash/wm/base_layout_manager_unittest.cc
index d9938851d3c13eb00dac2163176b069fc9cc8dc6..da71df75ca91c0fd99c1c2554ae7c5bce15c505c 100644
--- a/ash/wm/base_layout_manager_unittest.cc
+++ b/ash/wm/base_layout_manager_unittest.cc
@@ -164,7 +164,8 @@ TEST_F(BaseLayoutManagerTest, MAYBE_RootWindowResizeShrinksWindows) {
// to smaller than the full work area.
TEST_F(BaseLayoutManagerTest, BoundsWithScreenEdgeVisible) {
// Create a window with bounds that fill the screen.
- gfx::Rect bounds = gfx::Screen::GetPrimaryDisplay().bounds();
+ gfx::Rect bounds = gfx::Screen::GetPrimaryDisplay(
+ ash::Shell::GetRootNativeView()).bounds();
scoped_ptr<aura::Window> window(CreateTestWindow(bounds));
// Maximize it, which writes the old bounds to restore bounds.
window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);

Powered by Google App Engine
This is Rietveld 408576698