chrome/browser/ui/ash/ash_keyboard_controller_proxy.cc - Issue 138003007: [Cleanup] Screen cleanup

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

Issue 138003007: [Cleanup] Screen cleanup (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: make sure screen_for_shutdown is reset everytime Created 6 years, 11 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:

Index: chrome/browser/ui/ash/ash_keyboard_controller_proxy.cc

diff --git a/chrome/browser/ui/ash/ash_keyboard_controller_proxy.cc b/chrome/browser/ui/ash/ash_keyboard_controller_proxy.cc

index 6e40b63f8ee6bb81242d9dcc194babca4c8ca7e2..7a2ed00bd5ac538537182e7ec5e17a3c642eae64 100644

--- a/chrome/browser/ui/ash/ash_keyboard_controller_proxy.cc

+++ b/chrome/browser/ui/ash/ash_keyboard_controller_proxy.cc

@@ -183,7 +183,7 @@ void AshKeyboardControllerProxy::ShowKeyboardContainer(

// is set.

if (GetInputMethod()->GetTextInputClient()) {

gfx::Rect showing_area =

- ash::DisplayController::GetPrimaryDisplay().work_area();

+ ash::Shell::GetScreen()->GetPrimaryDisplay().work_area();

GetInputMethod()->GetTextInputClient()->EnsureCaretInRect(showing_area);

}