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

Side by Side Diff: ash/shelf/shelf_layout_manager.h

Issue 143023003: Fully support the autohide shelf option for touch UI on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Compile out edge swipe code on non-Windows, and add tests. Created 6 years, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ 5 #ifndef ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
6 #define ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ 6 #define ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 ShelfWidget* shelf_widget() { return shelf_; } 147 ShelfWidget* shelf_widget() { return shelf_; }
148 148
149 // Sets whether any windows overlap the shelf. If a window overlaps the shelf 149 // Sets whether any windows overlap the shelf. If a window overlaps the shelf
150 // the shelf renders slightly differently. 150 // the shelf renders slightly differently.
151 void SetWindowOverlapsShelf(bool value); 151 void SetWindowOverlapsShelf(bool value);
152 bool window_overlaps_shelf() const { return window_overlaps_shelf_; } 152 bool window_overlaps_shelf() const { return window_overlaps_shelf_; }
153 153
154 void AddObserver(ShelfLayoutManagerObserver* observer); 154 void AddObserver(ShelfLayoutManagerObserver* observer);
155 void RemoveObserver(ShelfLayoutManagerObserver* observer); 155 void RemoveObserver(ShelfLayoutManagerObserver* observer);
156 156
157 // Gesture dragging related functions: 157 // Gesture related functions:
158 #if defined(OS_WIN)
159 void OnGestureEdgeSwipe(const ui::GestureEvent& gesture);
160 #endif
161
158 void StartGestureDrag(const ui::GestureEvent& gesture); 162 void StartGestureDrag(const ui::GestureEvent& gesture);
159 enum DragState { 163 enum DragState {
160 DRAG_SHELF, 164 DRAG_SHELF,
161 DRAG_TRAY 165 DRAG_TRAY
162 }; 166 };
163 // Returns DRAG_SHELF if the gesture should continue to drag the entire shelf. 167 // Returns DRAG_SHELF if the gesture should continue to drag the entire shelf.
164 // Returns DRAG_TRAY if the gesture can start dragging the tray-bubble from 168 // Returns DRAG_TRAY if the gesture can start dragging the tray-bubble from
165 // this point on. 169 // this point on.
166 DragState UpdateGestureDrag(const ui::GestureEvent& gesture); 170 DragState UpdateGestureDrag(const ui::GestureEvent& gesture);
167 void CompleteGestureDrag(const ui::GestureEvent& gesture); 171 void CompleteGestureDrag(const ui::GestureEvent& gesture);
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 // The show hide animation duration override or 0 for default. 415 // The show hide animation duration override or 0 for default.
412 int duration_override_in_ms_; 416 int duration_override_in_ms_;
413 417
414 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager); 418 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
415 }; 419 };
416 420
417 } // namespace internal 421 } // namespace internal
418 } // namespace ash 422 } // namespace ash
419 423
420 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ 424 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
OLDNEW
« no previous file with comments | « no previous file | ash/shelf/shelf_layout_manager.cc » ('j') | ash/wm/gestures/shelf_gesture_handler.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698