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

Unified Diff: ash/shelf/shelf_layout_manager.cc

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: Rebase to ToT 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/shelf/shelf_layout_manager.h ('k') | ash/shelf/shelf_layout_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_layout_manager.cc
diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc
index 3b257b07ca6924122135a75492d13ac5b8cfca8c..1639fc80e812edf80949959d4ab208069256afb2 100644
--- a/ash/shelf/shelf_layout_manager.cc
+++ b/ash/shelf/shelf_layout_manager.cc
@@ -10,6 +10,7 @@
#include <string>
#include <vector>
+#include "ash/accelerators/accelerator_commands.h"
#include "ash/ash_switches.h"
#include "ash/root_window_controller.h"
#include "ash/screen_util.h"
@@ -389,7 +390,23 @@ void ShelfLayoutManager::RemoveObserver(ShelfLayoutManagerObserver* observer) {
}
////////////////////////////////////////////////////////////////////////////////
-// ShelfLayoutManager, Gesture dragging:
+// ShelfLayoutManager, Gesture functions:
+
+void ShelfLayoutManager::OnGestureEdgeSwipe(const ui::GestureEvent& gesture) {
+ // Edge swipe should exit fullscreen, show the tray, and disable auto-hide.
+
+ if (workspace_controller_->GetWindowState() ==
+ WORKSPACE_WINDOW_STATE_FULL_SCREEN) {
+ accelerators::ToggleFullscreen();
+ }
+
+ ShelfVisibilityState visibility = CalculateShelfVisibility();
+ if (visibility == SHELF_AUTO_HIDE &&
+ CalculateAutoHideState(visibility) == SHELF_AUTO_HIDE_HIDDEN) {
+ SetState(SHELF_VISIBLE);
+ SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_NEVER);
+ }
+}
void ShelfLayoutManager::StartGestureDrag(const ui::GestureEvent& gesture) {
gesture_drag_status_ = GESTURE_DRAG_IN_PROGRESS;
« no previous file with comments | « ash/shelf/shelf_layout_manager.h ('k') | ash/shelf/shelf_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698