ui/views/examples/examples_main.cc - Issue 1915363002: Rename gfx::Display/Screen to display::Display/Screen in views/wm

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/views/examples/examples_main.cc

Issue 1915363002: Rename gfx::Display/Screen to display::Display/Screen in views/wm (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: more cleanups Created 4 years, 8 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

Index: ui/views/examples/examples_main.cc

diff --git a/ui/views/examples/examples_main.cc b/ui/views/examples/examples_main.cc

index b1a002182078ee457053723c484d919afc3fd86c..206bcda6cb9fc86436acc3b3906615b55ab295c7 100644

--- a/ui/views/examples/examples_main.cc

+++ b/ui/views/examples/examples_main.cc

@@ -20,7 +20,7 @@

#include "ui/base/resource/resource_bundle.h"

#include "ui/base/ui_base_paths.h"

#include "ui/compositor/test/in_process_context_factory.h"

-#include "ui/gfx/screen.h"

+#include "ui/display/screen.h"

#include "ui/gl/gl_surface.h"

#include "ui/views/examples/example_base.h"

#include "ui/views/examples/examples_window.h"

@@ -98,7 +98,7 @@ int main(int argc, char** argv) {

#endif

#if !defined(OS_CHROMEOS) && defined(USE_AURA)

std::unique_ptr<gfx::Screen> desktop_screen(views::CreateDesktopScreen());

- gfx::Screen::SetScreenInstance(desktop_screen.get());

+ display::Screen::SetScreenInstance(desktop_screen.get());

#endif

views::examples::ShowExamplesWindow(

« no previous file with comments | « ui/views/drag_utils.cc ('k') | ui/views/mouse_watcher_view_host.cc » ('j') | no next file with comments »