Chromium Code Reviews| Index: ash/wm/gestures/shelf_gesture_handler.cc |
| diff --git a/ash/wm/gestures/shelf_gesture_handler.cc b/ash/wm/gestures/shelf_gesture_handler.cc |
| index 847820d3ea71cfbdccdbd977e4b2038a2f64dc71..5d1ad9dd4fd7ce5f315ec8469716564d413c5639 100644 |
| --- a/ash/wm/gestures/shelf_gesture_handler.cc |
| +++ b/ash/wm/gestures/shelf_gesture_handler.cc |
| @@ -12,6 +12,7 @@ |
| #include "ash/shell.h" |
| #include "ash/system/status_area_widget.h" |
| #include "ash/wm/gestures/tray_gesture_handler.h" |
| +#include "ash/wm/window_properties.h" |
| #include "ash/wm/window_util.h" |
| #include "ui/aura/window.h" |
| #include "ui/compositor/layer.h" |
| @@ -39,7 +40,9 @@ bool ShelfGestureHandler::ProcessGestureEvent(const ui::GestureEvent& event) { |
| // The gesture are disabled for fullscreen windows. |
| aura::Window* active = wm::GetActiveWindow(); |
| - if (active && wm::IsWindowFullscreen(active)) |
| + if (active && |
| + wm::IsWindowFullscreen(active) && |
| + !active->GetProperty(kFullscreenUsesMinimalChromeKey)) |
|
pkotwicz
2013/05/16 19:11:49
For the sake of consistency, shouldn't you use Get
rharrison
2013/05/16 20:28:31
Done.
|
| return false; |
| // TODO(oshima): Find the root window controller from event's location. |