summaryrefslogtreecommitdiffstats
path: root/ui/aura/window.h
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-23 16:21:17 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-23 16:21:17 +0000
commite8de9ea15ead4a310e303b86f785433c837e5910 (patch)
tree400fd599de7f09887fa28695186e102a570b7ca8 /ui/aura/window.h
parent5ebd74c164778f697a4deea82bc0fd469c6999fd (diff)
downloadchromium_src-e8de9ea15ead4a310e303b86f785433c837e5910.zip
chromium_src-e8de9ea15ead4a310e303b86f785433c837e5910.tar.gz
chromium_src-e8de9ea15ead4a310e303b86f785433c837e5910.tar.bz2
Remove stops_event_propagation from Window, since it's broken.
Changes it to be implemented by the Aura client, via a new interface EventClient. The client can determine whether or not a given window and its subtree can receive events. I also cleaned up the way screen locking is entered/exited via the delegate, and some stuff in ash/shell. http://crbug.com/119347 TEST=none Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=128328 Review URL: https://chromiumcodereview.appspot.com/9788001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128503 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/window.h')
-rw-r--r--ui/aura/window.h24
1 files changed, 1 insertions, 23 deletions
diff --git a/ui/aura/window.h b/ui/aura/window.h
index 95c6c21..c50bc20 100644
--- a/ui/aura/window.h
+++ b/ui/aura/window.h
@@ -218,15 +218,6 @@ class AURA_EXPORT Window : public ui::LayerDelegate {
void AddObserver(WindowObserver* observer);
void RemoveObserver(WindowObserver* observer);
- // When set to true, this Window will stop propagation of all events targeted
- // at Windows below it in the z-order, but only if this Window has children.
- // This is used to implement lock-screen type functionality where we do not
- // want events to be sent to running logged-in windows when the lock screen is
- // displayed.
- void set_stops_event_propagation(bool stops_event_propagation) {
- stops_event_propagation_ = stops_event_propagation;
- }
-
void set_ignore_events(bool ignore_events) { ignore_events_ = ignore_events; }
// Sets the window to grab hits for an area extending |outer| pixels outside
@@ -294,10 +285,6 @@ class AURA_EXPORT Window : public ui::LayerDelegate {
// Returns true if this window has a mouse capture.
bool HasCapture();
- // Returns true if this window is currently stopping event
- // propagation for any windows behind it in the z-order.
- bool StopsEventPropagation() const;
-
// Suppresses painting window content by disgarding damaged rect and ignoring
// new paint requests.
void SuppressPaint();
@@ -358,8 +345,7 @@ class AURA_EXPORT Window : public ui::LayerDelegate {
// If |return_tightest| is true, returns the tightest-containing (i.e.
// furthest down the hierarchy) Window containing the point; otherwise,
// returns the loosest. If |for_event_handling| is true, then hit-test masks
- // and StopsEventPropagation() are honored; otherwise, only bounds checks are
- // performed.
+ // are honored; otherwise, only bounds checks are performed.
Window* GetWindowForPoint(const gfx::Point& local_point,
bool return_tightest,
bool for_event_handling);
@@ -392,10 +378,6 @@ class AURA_EXPORT Window : public ui::LayerDelegate {
// Updates the layer name with a name based on the window's name and id.
void UpdateLayerName(const std::string& name);
- // Returns true if this window is behind a window that stops event
- // propagation.
- bool IsBehindStopEventsWindow() const;
-
client::WindowType type_;
WindowDelegate* delegate_;
@@ -437,10 +419,6 @@ class AURA_EXPORT Window : public ui::LayerDelegate {
void* user_data_;
- // When true, events are not sent to windows behind this one in the z-order,
- // provided this window has children. See set_stops_event_propagation().
- bool stops_event_propagation_;
-
// Makes the window pass all events through to any windows behind it.
bool ignore_events_;