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

Unified Diff: ash/wm/maximize_mode/maximize_mode_window_manager.cc

Issue 309793005: Fixing problem with edge swipe exiting immersive mode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 | « no previous file | ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc » ('j') | ash/wm/window_state.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/maximize_mode/maximize_mode_window_manager.cc
diff --git a/ash/wm/maximize_mode/maximize_mode_window_manager.cc b/ash/wm/maximize_mode/maximize_mode_window_manager.cc
index 15d1ca2298bef42c37afa0a46fe1a97c931c7228..7eccdaf9b6d74f3298d8ff9dff05b12e05652f19 100644
--- a/ash/wm/maximize_mode/maximize_mode_window_manager.cc
+++ b/ash/wm/maximize_mode/maximize_mode_window_manager.cc
@@ -138,7 +138,7 @@ void MaximizeModeWindowManager::OnTouchEvent(ui::TouchEvent* event) {
return;
wm::WindowState* window_state = wm::GetWindowState(window);
- if (!window_state->IsFullscreen())
+ if (!window_state->IsFullscreen() || window_state->immersive_mode())
return;
// Test that the touch happened in the top or bottom lines.
« no previous file with comments | « no previous file | ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc » ('j') | ash/wm/window_state.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698