ash/wm/workspace/workspace_layout_manager.cc - Issue 1177503003: Remove the 2-level input method system & InputMethodBridge.

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/wm/workspace/workspace_layout_manager.cc

Issue 1177503003: Remove the 2-level input method system & InputMethodBridge. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: makes trybots green. Created 5 years, 6 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/magnifier/magnification_controller_unittest.cc ('k') | ash/wm/workspace/workspace_layout_manager_unittest.cc » ('j') | ui/base/ime/mock_input_method.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/wm/workspace/workspace_layout_manager.cc

diff --git a/ash/wm/workspace/workspace_layout_manager.cc b/ash/wm/workspace/workspace_layout_manager.cc

index 89c26aff3edce05c2ff94f29a267680f940c7534..d9f3e8dafdba2eda1e0820fd5943145165d94c5b 100644

--- a/ash/wm/workspace/workspace_layout_manager.cc

+++ b/ash/wm/workspace/workspace_layout_manager.cc

@@ -23,8 +23,6 @@

#include "ui/aura/client/aura_constants.h"

#include "ui/aura/window.h"

#include "ui/aura/window_observer.h"

-#include "ui/base/ime/input_method.h"

-#include "ui/base/ime/text_input_client.h"

#include "ui/base/ui_base_types.h"

#include "ui/compositor/layer.h"

#include "ui/events/event.h"

@@ -134,12 +132,7 @@ void WorkspaceLayoutManager::SetChildBounds(

void WorkspaceLayoutManager::OnKeyboardBoundsChanging(

const gfx::Rect& new_bounds) {

- ui::InputMethod* input_method = root_window_->GetHost()->GetInputMethod();

- ui::TextInputClient* text_input_client = input_method->GetTextInputClient();

- if (!text_input_client)

- return;

- aura::Window *window =

- text_input_client->GetAttachedWindow()->GetToplevelWindow();

+ aura::Window* window = wm::GetActiveWindow()->GetToplevelWindow();

if (!window || !window_->Contains(window))

return;

wm::WindowState* window_state = wm::GetWindowState(window);