ash/root_window_controller.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/root_window_controller.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/root_window_controller.cc

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

index 6665d7f290500672eba3eb404b50c1bd0683e438..c3db261b4a281c5e913d7e9a26aacead5d526227 100644

--- a/ash/root_window_controller.cc

+++ b/ash/root_window_controller.cc

@@ -65,8 +65,8 @@

#include "ui/aura/window_tracker.h"

#include "ui/base/hit_test.h"

#include "ui/base/models/menu_model.h"

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

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

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

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

#include "ui/keyboard/keyboard_controller.h"

#include "ui/keyboard/keyboard_util.h"

#include "ui/views/controls/menu/menu_runner.h"

@@ -397,7 +397,7 @@ void RootWindowController::Shutdown() {

// Forget with the display ID so that display lookup

// ends up with invalid display.

GetRootWindowSettings(root_window)->display_id =

- gfx::Display::kInvalidDisplayID;

+ display::Display::kInvalidDisplayID;

ash_host_->PrepareForShutdown();

system_background_.reset();

« no previous file with comments | « ash/mus/sysui_application.cc ('k') | ash/root_window_controller_unittest.cc » ('j') | no next file with comments »