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

Unified Diff: ash/shell.h

Issue 1155013005: Refactoring the ownership of ui::InputMethod. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index cb46540be67024994d76283a444bec82bd950b68..05b7e20f5d49746b985a496fe06c2c0b6a05bd30 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -65,7 +65,6 @@ class TooltipController;
namespace wm {
class AcceleratorFilter;
class CompoundEventFilter;
-class InputMethodEventFilter;
class NestedAcceleratorController;
class ShadowController;
class VisibilityController;
@@ -346,9 +345,6 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
}
DisplayManager* display_manager() { return display_manager_.get(); }
- ::wm::InputMethodEventFilter* input_method_filter() {
- return input_method_filter_.get();
- }
::wm::CompoundEventFilter* env_filter() {
return env_filter_.get();
}
@@ -704,9 +700,6 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
// An event filter that pre-handles global accelerators.
scoped_ptr< ::wm::AcceleratorFilter> accelerator_filter_;
- // An event filter that pre-handles all key events to send them to an IME.
- scoped_ptr< ::wm::InputMethodEventFilter> input_method_filter_;
-
scoped_ptr<DisplayManager> display_manager_;
scoped_ptr<LocaleNotificationController> locale_notification_controller_;

Powered by Google App Engine
This is Rietveld 408576698