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

Unified Diff: ash/wm/overlay_event_filter.h

Issue 461093003: Fix the bug of multiple overlays. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: win fix Created 6 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 | « ash/test/test_overlay_delegate.cc ('k') | ash/wm/overlay_event_filter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/overlay_event_filter.h
diff --git a/ash/wm/overlay_event_filter.h b/ash/wm/overlay_event_filter.h
index 7787c45b1e447b360a69cc5b60e8f72fe90f2d14..c46215300426b7ee91813c1be98fc01d87b97774 100644
--- a/ash/wm/overlay_event_filter.h
+++ b/ash/wm/overlay_event_filter.h
@@ -46,11 +46,14 @@ class ASH_EXPORT OverlayEventFilter : public ui::EventHandler,
void Activate(Delegate* delegate);
// Ends the filtering of events.
- void Deactivate();
+ void Deactivate(Delegate* delegate);
// Cancels the partial screenshot UI. Do nothing if it's not activated.
void Cancel();
+ // Returns true if it's currently active.
+ bool IsActive();
+
// ui::EventHandler overrides:
virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
@@ -60,6 +63,8 @@ class ASH_EXPORT OverlayEventFilter : public ui::EventHandler,
virtual void OnLockStateChanged(bool locked) OVERRIDE;
private:
+ FRIEND_TEST_ALL_PREFIXES(PartialScreenshotViewTest, DontStartOverOverlay);
+
Delegate* delegate_;
DISALLOW_COPY_AND_ASSIGN(OverlayEventFilter);
« no previous file with comments | « ash/test/test_overlay_delegate.cc ('k') | ash/wm/overlay_event_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698