ui/mojo/init/ui_init.cc - Issue 1407073002: Adds GetDisplays() to WindowManager

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: ui/mojo/init/ui_init.cc

Issue 1407073002: Adds GetDisplays() to WindowManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: merge 2 trunk Created 5 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:

Index: ui/mojo/init/ui_init.cc

diff --git a/ui/mojo/init/ui_init.cc b/ui/mojo/init/ui_init.cc

index 937112eeb4d1721e342b3d51ed9f6c12eb5bdc53..3b4c4ab56b6cfdf58d4d2c31ece784fb1748a091 100644

--- a/ui/mojo/init/ui_init.cc

+++ b/ui/mojo/init/ui_init.cc

@@ -39,8 +39,8 @@ class GestureConfigurationMojo : public ui::GestureConfiguration {

};

#endif

-UIInit::UIInit(const gfx::Size& screen_size_in_pixels, float device_pixel_ratio)

- : screen_(new ScreenMojo(screen_size_in_pixels, device_pixel_ratio)) {

+UIInit::UIInit(const std::vector<gfx::Display>& displays)

+ : screen_(new ScreenMojo(displays)) {

gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_.get());

#if defined(OS_ANDROID)

gesture_configuration_.reset(new GestureConfigurationMojo);

« no previous file with comments | « ui/mojo/init/ui_init.h ('k') | ui/views/mus/aura_init.h » ('j') | no next file with comments »