chrome/browser/ui/views/frame/app_non_client_frame_view_aura_browsertest.cc - Issue 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/frame/app_non_client_frame_view_aura_browsertest.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 some new gfx::Screen additions 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

« chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc ('K') | « chrome/browser/ui/views/extensions/extension_dialog.cc ('k') | chrome/browser/ui/views/fullscreen_exit_bubble_views.cc » ('j') | chrome/browser/ui/views/status_bubble_views.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/frame/app_non_client_frame_view_aura_browsertest.cc

diff --git a/chrome/browser/ui/views/frame/app_non_client_frame_view_aura_browsertest.cc b/chrome/browser/ui/views/frame/app_non_client_frame_view_aura_browsertest.cc

index 3b1715ab0a2824349108272817e1e45b338d5de3..ecde0a38a76a7b85be46f6489db4ae6d75cfd4b1 100644

--- a/chrome/browser/ui/views/frame/app_non_client_frame_view_aura_browsertest.cc

+++ b/chrome/browser/ui/views/frame/app_non_client_frame_view_aura_browsertest.cc

@@ -146,11 +146,11 @@ IN_PROC_BROWSER_TEST_F(AppNonClientFrameViewAuraTest, SnapLeftClosesControls) {

// Ensure that the controls are at the proper locations.

IN_PROC_BROWSER_TEST_F(AppNonClientFrameViewAuraTest, ControlsAtRightSide) {

- const gfx::Rect work_area = gfx::Screen::GetPrimaryDisplay().work_area();

aura::RootWindow* root_window = GetRootWindow();

aura::test::EventGenerator eg(root_window);

aura::Window* native_window = app_browser()->window()->GetNativeWindow();

+ const gfx::Rect work_area =

+ gfx::Screen::GetScreenFor(native_window)->GetPrimaryDisplay().work_area();

// Control window exists.

aura::Window* window = GetChildWindowNamed(