chrome/browser/ui/startup/startup_browser_creator_impl.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/startup/startup_browser_creator_impl.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/panels/display_settings_provider.cc ('K') | « chrome/browser/ui/panels/panel_mouse_watcher_timer.cc ('k') | chrome/browser/ui/views/app_list/app_list_controller_win.cc » ('j') | chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/startup/startup_browser_creator_impl.cc

diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc

index 451b0e5c5b8b01fc7719ceb7a846a9a56cd9f499..e464d715acd88ce89fefcec0d5709f91a78424a3 100644

--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc

+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc

@@ -441,7 +441,9 @@ void StartupBrowserCreatorImpl::ExtractOptionalAppWindowSize(

std::string switch_value =

command_line_.GetSwitchValueASCII(switches::kAppWindowSize);

if (ParseCommaSeparatedIntegers(switch_value, &width, &height)) {

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

+ // TODO(scottmg): NativeScreen might be wrong. http://crbug.com/133312

+ const gfx::Rect work_area =

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

width = std::min(width, work_area.width());

height = std::min(height, work_area.height());

bounds->set_size(gfx::Size(width, height));