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

Unified Diff: ash/shelf/shelf_layout_manager.cc

Issue 198413003: Enable immersive fullscreen on Windows Ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix issues from previous review comment. Created 6 years, 9 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/frame/custom_frame_view_ash.cc ('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 f13ea079023459d5b94dccd053abe87324ffcd63..9cc67d64e38708a546409e2e458dc542d03c3e16 100644
--- a/ash/shelf/shelf_layout_manager.cc
+++ b/ash/shelf/shelf_layout_manager.cc
@@ -393,18 +393,11 @@ void ShelfLayoutManager::RemoveObserver(ShelfLayoutManagerObserver* observer) {
// 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);
+ if (visibility_state() == SHELF_AUTO_HIDE) {
+ gesture_drag_auto_hide_state_ = SHELF_AUTO_HIDE_SHOWN;
+ gesture_drag_status_ = GESTURE_DRAG_COMPLETE_IN_PROGRESS;
+ UpdateVisibilityState();
+ gesture_drag_status_ = GESTURE_DRAG_NONE;
}
}
« no previous file with comments | « ash/frame/custom_frame_view_ash.cc ('k') | ash/shelf/shelf_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698