Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(229)

Unified Diff: ui/aura/desktop_host_win.h

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
« no previous file with comments | « ui/aura/desktop_host_linux.cc ('k') | ui/aura/desktop_host_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/desktop_host_win.h
===================================================================
--- ui/aura/desktop_host_win.h (revision 113258)
+++ ui/aura/desktop_host_win.h (working copy)
@@ -7,18 +7,12 @@
#pragma once
#include "base/compiler_specific.h"
-#include "base/memory/scoped_ptr.h"
#include "ui/aura/desktop_host.h"
#include "ui/base/win/window_impl.h"
-namespace ui {
-class InputMethod;
-} // namespace ui
-
namespace aura {
-class DesktopHostWin : public DesktopHost,
- public ui::WindowImpl {
+class DesktopHostWin : public DesktopHost, public ui::WindowImpl {
public:
explicit DesktopHostWin(const gfx::Rect& bounds);
virtual ~DesktopHostWin();
@@ -38,14 +32,6 @@
virtual gfx::Point QueryMouseLocation() OVERRIDE;
virtual void PostNativeEvent(const base::NativeEvent& native_event) OVERRIDE;
- virtual void SetInputMethod(ui::InputMethod* input_method) OVERRIDE;
- virtual ui::InputMethod* GetInputMethod() const OVERRIDE;
-
- // ui::internal::InputMethodDelegate Override.
- virtual void DispatchKeyEventPostIME(const base::NativeEvent& event) OVERRIDE;
- virtual void DispatchFabricatedKeyEventPostIME(
- ui::EventType type, ui::KeyboardCode key_code, int flags) OVERRIDE;
-
private:
BEGIN_MSG_MAP_EX(DesktopHostWin)
// Range handlers must go first!
@@ -74,8 +60,6 @@
Desktop* desktop_;
- scoped_ptr<ui::InputMethod> input_method_;
-
bool fullscreen_;
RECT saved_window_rect_;
DWORD saved_window_style_;
« no previous file with comments | « ui/aura/desktop_host_linux.cc ('k') | ui/aura/desktop_host_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698