chrome/browser/ui/webui/options/chromeos/display_options_handler.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/webui/options/chromeos/display_options_handler.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/tabs/tab_drag_controller_interactive_uitest.cc ('K') | « chrome/browser/ui/views/tabs/tab_strip.cc ('k') | chrome/browser/ui/window_sizer/window_sizer.cc » ('j') | chrome/browser/ui/window_sizer/window_sizer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/chromeos/display_options_handler.cc

diff --git a/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc

index 5646e74fcf81bdfc1b637a71280d3ae3eace396d..fa0b66f8730f27d15fb5128d055d1f626fc8f3b6 100644

--- a/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc

+++ b/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc

@@ -117,7 +117,7 @@ void DisplayOptionsHandler::SendDisplayInfo() {

base::FundamentalValue mirroring(

output_configurator->output_state() == chromeos::STATE_DUAL_MIRROR);

- int64 primary_id = gfx::Screen::GetPrimaryDisplay().id();

+ int64 primary_id = ash::Shell::GetAshScreen()->GetPrimaryDisplay().id();

base::ListValue displays;

for (size_t i = 0; i < display_manager->GetNumDisplays(); ++i) {

const gfx::Display* display = display_manager->GetDisplayAt(i);