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

Unified Diff: ash/wm/maximize_mode/maximize_mode_event_blocker.h

Issue 269633005: Only block internal touchpad and allow external mice to continue working in maximize mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 6 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/wm/maximize_mode/maximize_mode_event_blocker.h
diff --git a/ash/wm/maximize_mode/maximize_mode_event_blocker.h b/ash/wm/maximize_mode/maximize_mode_event_blocker.h
index 9e4a1a0bfa043fadc7e26af67621c719a8c173f6..4f7fae7c32d918ed8638fa7042301f89538b767e 100644
--- a/ash/wm/maximize_mode/maximize_mode_event_blocker.h
+++ b/ash/wm/maximize_mode/maximize_mode_event_blocker.h
@@ -5,8 +5,11 @@
#ifndef ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_EVENT_BLOCKER_H_
#define ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_EVENT_BLOCKER_H_
+#include <set>
+
#include "ash/shell_observer.h"
#include "base/macros.h"
+#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
#include "ui/aura/scoped_window_targeter.h"
@@ -16,6 +19,9 @@ class Window;
namespace ash {
+class InternalInputDeviceList;
+class MaximizeModeControllerTest;
+
// A class which blocks mouse and keyboard events while instantiated by
// replacing the root window event targeter.
class MaximizeModeEventBlocker : public ShellObserver {
@@ -23,14 +29,21 @@ class MaximizeModeEventBlocker : public ShellObserver {
MaximizeModeEventBlocker();
virtual ~MaximizeModeEventBlocker();
+ InternalInputDeviceList* internal_devices() {
+ return internal_devices_.get();
+ }
+
// ShellObserver:
virtual void OnRootWindowAdded(aura::Window* root_window) OVERRIDE;
private:
+ friend class MaximizeModeControllerTest;
+
// Adds an event targeter on |root_window| to block mouse and keyboard events.
void AddEventTargeterOn(aura::Window* root_window);
ScopedVector<aura::ScopedWindowTargeter> targeters_;
+ scoped_ptr<InternalInputDeviceList> internal_devices_;
DISALLOW_COPY_AND_ASSIGN(MaximizeModeEventBlocker);
};
« no previous file with comments | « ash/wm/maximize_mode/maximize_mode_controller_unittest.cc ('k') | ash/wm/maximize_mode/maximize_mode_event_blocker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698