chrome/browser/ui/ime/ime_window.cc - Issue 1920263003: Rename gfx::Display/Screen to display::Display/Screen in chrome

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: chrome/browser/ui/ime/ime_window.cc

Issue 1920263003: Rename gfx::Display/Screen to display::Display/Screen in chrome (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

« chrome/browser/ui/autofill/popup_view_common.cc ('K') | « chrome/browser/ui/autofill/popup_view_common_unittest.cc ('k') | chrome/browser/ui/libgtk2ui/gtk2_ui.cc » ('j') | chrome/browser/ui/views/app_list/win/app_list_win.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ime/ime_window.cc

diff --git a/chrome/browser/ui/ime/ime_window.cc b/chrome/browser/ui/ime/ime_window.cc

index 5f45f4218fa8a67e6808c2dd141e7faf9796c2f1..3fd264a4c2929a63df5b62d56d5c30a295af52cd 100644

--- a/chrome/browser/ui/ime/ime_window.cc

+++ b/chrome/browser/ui/ime/ime_window.cc

@@ -17,8 +17,8 @@

#include "extensions/common/constants.h"

#include "extensions/common/extension.h"

#include "extensions/common/manifest_handlers/icons_handler.h"

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

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

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

namespace {

@@ -99,7 +99,7 @@ void ImeWindow::FollowCursor(const gfx::Rect& cursor_bounds) {

return;

gfx::Rect screen_bounds =

- gfx::Screen::GetScreen()->GetPrimaryDisplay().bounds();

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

gfx::Rect window_bounds = native_window_->GetBounds();

int screen_width = screen_bounds.width();

int screen_height = screen_bounds.height();