ui/aura/desktop.cc - Issue 8824007: Revert 113224 - IME (input method editor) support for Aura, part 3 of 3: Use ui::InputMethod in u...

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: ui/aura/desktop.cc

Issue 8824007: Revert 113224 - IME (input method editor) support for Aura, part 3 of 3: Use ui::InputMethod in u... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years 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: ui/aura/desktop.cc

===================================================================

--- ui/aura/desktop.cc (revision 113258)

+++ ui/aura/desktop.cc (working copy)

@@ -24,7 +24,6 @@

#include "ui/aura/window.h"

#include "ui/aura/window_delegate.h"

#include "ui/base/hit_test.h"

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

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

#include "ui/gfx/compositor/layer.h"

#include "ui/gfx/compositor/layer_animator.h"

@@ -609,8 +608,4 @@

return bounds;

}

-ui::InputMethod* Desktop::GetInputMethod() {

- return host_->GetInputMethod();

} // namespace aura

« no previous file with comments | « ui/aura/desktop.h ('k') | ui/aura/desktop_host.h » ('j') | no next file with comments »