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

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

Issue 2824233003: Disallow toggling of shelf auto-hide with touch when there are no windows open (Closed)
Patch Set: Addressed comments. Created 3 years, 8 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
« no previous file with comments | « no previous file | ash/shelf/shelf_layout_manager.cc » ('j') | ash/shelf/shelf_layout_manager.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 <memory> 8 #include <memory>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 // Stops the auto hide timer and clears 254 // Stops the auto hide timer and clears
255 // |mouse_over_shelf_when_auto_hide_timer_started_|. 255 // |mouse_over_shelf_when_auto_hide_timer_started_|.
256 void StopAutoHideTimer(); 256 void StopAutoHideTimer();
257 257
258 // Returns the bounds of an additional region which can trigger showing the 258 // Returns the bounds of an additional region which can trigger showing the
259 // shelf. This region exists to make it easier to trigger showing the shelf 259 // shelf. This region exists to make it easier to trigger showing the shelf
260 // when the shelf is auto hidden and the shelf is on the boundary between 260 // when the shelf is auto hidden and the shelf is on the boundary between
261 // two displays. 261 // two displays.
262 gfx::Rect GetAutoHideShowShelfRegionInScreen() const; 262 gfx::Rect GetAutoHideShowShelfRegionInScreen() const;
263 263
264 // Returns true if at least one window is visible.
265 bool HasVisibleWindow() const;
266
264 // Returns the AutoHideState. This value is determined from the shelf and 267 // Returns the AutoHideState. This value is determined from the shelf and
265 // tray. 268 // tray.
266 ShelfAutoHideState CalculateAutoHideState( 269 ShelfAutoHideState CalculateAutoHideState(
267 ShelfVisibilityState visibility_state) const; 270 ShelfVisibilityState visibility_state) const;
268 271
269 // Returns true if |window| is a descendant of the shelf. 272 // Returns true if |window| is a descendant of the shelf.
270 bool IsShelfWindow(WmWindow* window); 273 bool IsShelfWindow(WmWindow* window);
271 274
272 int GetWorkAreaInsets(const State& state, int size) const; 275 int GetWorkAreaInsets(const State& state, int size) const;
273 276
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 keyboard::KeyboardControllerObserver> 364 keyboard::KeyboardControllerObserver>
362 keyboard_observer_; 365 keyboard_observer_;
363 ScopedSessionObserver scoped_session_observer_; 366 ScopedSessionObserver scoped_session_observer_;
364 367
365 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager); 368 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
366 }; 369 };
367 370
368 } // namespace ash 371 } // namespace ash
369 372
370 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ 373 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
OLDNEW
« no previous file with comments | « no previous file | ash/shelf/shelf_layout_manager.cc » ('j') | ash/shelf/shelf_layout_manager.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698