diff options
| author | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-26 03:25:18 +0000 |
|---|---|---|
| committer | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-26 03:25:18 +0000 |
| commit | 9ae32df7e045a681bf2b65009997f5e93badbfe6 (patch) | |
| tree | 309e4cde7eef398ee838ecf321fed64e66c5edfa /ash/shell.cc | |
| parent | 177bcf2f346f89e8e56b8e301fc3dc5ec9b060a0 (diff) | |
| download | chromium_src-9ae32df7e045a681bf2b65009997f5e93badbfe6.zip chromium_src-9ae32df7e045a681bf2b65009997f5e93badbfe6.tar.gz chromium_src-9ae32df7e045a681bf2b65009997f5e93badbfe6.tar.bz2 | |
Make accelerators not to work when the keyboard overlay is shown.
- Refactor PartialScreenshotEventFiler so that it can be reused, and renamed it to OverlayEventFilter
- Use OverlayEventFilter for the keyboard overlay
BUG=129834
TEST=Manually check accelerators do not work when the keyboard overlay.
Review URL: https://chromiumcodereview.appspot.com/10825026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148504 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index 535b3a4..cab6160 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -41,9 +41,9 @@ #include "ash/wm/dialog_frame_view.h" #include "ash/wm/event_client_impl.h" #include "ash/wm/event_rewriter_event_filter.h" +#include "ash/wm/overlay_event_filter.h" #include "ash/wm/panel_layout_manager.h" #include "ash/wm/panel_window_event_filter.h" -#include "ash/wm/partial_screenshot_event_filter.h" #include "ash/wm/power_button_controller.h" #include "ash/wm/resize_shadow_controller.h" #include "ash/wm/root_window_layout_manager.h" @@ -209,7 +209,7 @@ Shell::~Shell() { // Please keep in same order as in Init() because it's easy to miss one. RemoveEnvEventFilter(user_activity_detector_.get()); RemoveEnvEventFilter(event_rewriter_filter_.get()); - RemoveEnvEventFilter(partial_screenshot_filter_.get()); + RemoveEnvEventFilter(overlay_filter_.get()); RemoveEnvEventFilter(input_method_filter_.get()); RemoveEnvEventFilter(window_modality_controller_.get()); if (mouse_cursor_filter_.get()) @@ -398,9 +398,9 @@ void Shell::Init() { AddEnvEventFilter(event_rewriter_filter_.get()); DCHECK_EQ(2U, GetEnvEventFilterCount()); - partial_screenshot_filter_.reset(new internal::PartialScreenshotEventFilter); - AddEnvEventFilter(partial_screenshot_filter_.get()); - AddShellObserver(partial_screenshot_filter_.get()); + overlay_filter_.reset(new internal::OverlayEventFilter); + AddEnvEventFilter(overlay_filter_.get()); + AddShellObserver(overlay_filter_.get()); DCHECK_EQ(3U, GetEnvEventFilterCount()); input_method_filter_.reset(new aura::shared::InputMethodEventFilter()); |