ash/shell.cc - Issue 1924703002: Rename gfx::Display/Screen to display::Display/Screen in 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: ash/shell.cc

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

Patch Set: 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: ash/shell.cc

diff --git a/ash/shell.cc b/ash/shell.cc

index 05bf99a93080e77acdac3749cf915fae974629a3..96f3aa8ec160a8e081993bcda5c8768e35709519 100644

--- a/ash/shell.cc

+++ b/ash/shell.cc

@@ -96,11 +96,11 @@

#include "ui/base/user_activity/user_activity_detector.h"

#include "ui/compositor/layer.h"

#include "ui/compositor/layer_animator.h"

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

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

#include "ui/events/event_target_iterator.h"

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

#include "ui/gfx/geometry/size.h"

#include "ui/gfx/image/image_skia.h"

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

#include "ui/keyboard/keyboard_controller.h"

#include "ui/keyboard/keyboard_switches.h"

#include "ui/keyboard/keyboard_util.h"

@@ -970,7 +970,8 @@ void Shell::Init(const ShellInitParams& init_params) {

#endif

if (cursor_manager_)

- cursor_manager_->SetDisplay(gfx::Screen::GetScreen()->GetPrimaryDisplay());

+ cursor_manager_->SetDisplay(

+ display::Screen::GetScreen()->GetPrimaryDisplay());

accelerator_controller_.reset(new AcceleratorController);

maximize_mode_controller_.reset(new MaximizeModeController());

« no previous file with comments | « ash/shell.h ('k') | ash/shell/content/client/shell_browser_main_parts.cc » ('j') | no next file with comments »