ui/mojo/init/ui_init.cc - Issue 1608733002: Remove ui/gfx/screen_type_delegate.h

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 1608733002: Remove ui/gfx/screen_type_delegate.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-4

Patch Set: and another rebase Created 4 years, 11 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 7be35c749b1ef3d51aca0cfd976eb93a02de1598..34b0ae349e60197e55ce8b876147569deacc3413 100644

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

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

@@ -43,7 +43,7 @@ class GestureConfigurationMojo : public ui::GestureConfiguration {

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

: screen_(new ScreenMojo(displays)) {

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

+ gfx::Screen::SetScreenInstance(screen_.get());

#if defined(OS_ANDROID)

gesture_configuration_.reset(new GestureConfigurationMojo);

ui::GestureConfiguration::SetInstance(gesture_configuration_.get());

@@ -51,7 +51,7 @@ UIInit::UIInit(const std::vector<gfx::Display>& displays)

}

UIInit::~UIInit() {

- gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, nullptr);

+ gfx::Screen::SetScreenInstance(nullptr);

#if defined(OS_ANDROID)

ui::GestureConfiguration::SetInstance(nullptr);

#endif

« no previous file with comments | « ui/message_center/views/toast_contents_view.cc ('k') | ui/snapshot/snapshot_android.cc » ('j') | no next file with comments »