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

Unified Diff: ash/shell.cc

Issue 10825026: Make accelerators not to work when the keyboard overlay is shown. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address comments Created 8 years, 5 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 | « ash/shell.h ('k') | ash/wm/overlay_event_filter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 42986da4ecab4118ad814ed37e174d9bc50b5d41..4fb5892fc24f9945dfe2207f0010e6d3d8d256cc 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"
@@ -210,7 +210,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())
@@ -400,9 +400,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());
« no previous file with comments | « ash/shell.h ('k') | ash/wm/overlay_event_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698