ash/content/keyboard_overlay/keyboard_overlay_delegate.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/content/keyboard_overlay/keyboard_overlay_delegate.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

« no previous file with comments | « ash/content/display/screen_orientation_controller_chromeos_unittest.cc ('k') | ash/content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/content/keyboard_overlay/keyboard_overlay_delegate.cc

diff --git a/ash/content/keyboard_overlay/keyboard_overlay_delegate.cc b/ash/content/keyboard_overlay/keyboard_overlay_delegate.cc

index fe0a5c349c1e6da0b58df23c568d79058be0859f..078dfe6179922d43ac4da8b03112a36270d853b2 100644

--- a/ash/content/keyboard_overlay/keyboard_overlay_delegate.cc

+++ b/ash/content/keyboard_overlay/keyboard_overlay_delegate.cc

@@ -14,7 +14,7 @@

#include "content/public/browser/web_ui.h"

#include "content/public/browser/web_ui_message_handler.h"

#include "ui/aura/window_event_dispatcher.h"

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

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

#include "ui/views/controls/webview/web_dialog_view.h"

#include "ui/views/widget/widget.h"

@@ -77,7 +77,7 @@ views::Widget* KeyboardOverlayDelegate::Show(views::WebDialogView* view) {

gfx::Size size;

GetDialogSize(&size);

const gfx::Rect& rect =

- gfx::Screen::GetScreen()

+ display::Screen::GetScreen()

->GetDisplayNearestWindow(widget_->GetNativeView())

.work_area();

gfx::Rect bounds(rect.x() + (rect.width() - size.width()) / 2,

@@ -108,7 +108,7 @@ void KeyboardOverlayDelegate::GetWebUIMessageHandlers(

void KeyboardOverlayDelegate::GetDialogSize(gfx::Size* size) const {

using std::min;

DCHECK(widget_);

- gfx::Rect rect = gfx::Screen::GetScreen()

+ gfx::Rect rect = display::Screen::GetScreen()

->GetDisplayNearestWindow(widget_->GetNativeView())

.work_area();

const int width = min(kBaseWidth, rect.width() - kHorizontalMargin);