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

Unified Diff: ui/views/mus/window_tree_host_mus.h

Issue 2284003002: Revert of IME for Mus: Make InputMethodMus use the IME Mojo API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 | « ui/views/mus/text_input_client_impl.cc ('k') | ui/views/mus/window_tree_host_mus.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/mus/window_tree_host_mus.h
diff --git a/ui/views/mus/window_tree_host_mus.h b/ui/views/mus/window_tree_host_mus.h
index a606553260663648ea91c8a8b56dee70398b92e5..fa096fcadd8cc0f52a121292d877ed508adc1d6b 100644
--- a/ui/views/mus/window_tree_host_mus.h
+++ b/ui/views/mus/window_tree_host_mus.h
@@ -6,7 +6,6 @@
#define UI_VIEWS_MUS_WINDOW_TREE_HOST_MUS_H_
#include "base/macros.h"
-#include "services/shell/public/cpp/connector.h"
#include "ui/aura/window_tree_host_platform.h"
#include "ui/views/mus/mus_export.h"
@@ -22,7 +21,7 @@
namespace views {
-class InputMethodMus;
+class InputMethodMUS;
class NativeWidgetMus;
class PlatformWindowMus;
@@ -32,8 +31,6 @@
~WindowTreeHostMus() override;
NativeWidgetMus* native_widget() { return native_widget_; }
- void InitInputMethod(shell::Connector* connector);
-
private:
// aura::WindowTreeHostPlatform:
void DispatchEvent(ui::Event* event) override;
@@ -42,7 +39,7 @@
void OnCloseRequest() override;
NativeWidgetMus* native_widget_;
- std::unique_ptr<InputMethodMus> input_method_;
+ std::unique_ptr<InputMethodMUS> input_method_;
DISALLOW_COPY_AND_ASSIGN(WindowTreeHostMus);
};
« no previous file with comments | « ui/views/mus/text_input_client_impl.cc ('k') | ui/views/mus/window_tree_host_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698