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

Side by Side Diff: ash/wm/gestures/shelf_gesture_handler.cc

Issue 23534049: RootWindowController::GetFullscreenWindow() should return the active one. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fullscreen_win Created 7 years, 3 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
« no previous file with comments | « ash/shelf/shelf_layout_manager.cc ('k') | chrome/browser/fullscreen_chromeos.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "ash/wm/gestures/shelf_gesture_handler.h" 5 #include "ash/wm/gestures/shelf_gesture_handler.h"
6 6
7 #include "ash/root_window_controller.h" 7 #include "ash/root_window_controller.h"
8 #include "ash/session_state_delegate.h" 8 #include "ash/session_state_delegate.h"
9 #include "ash/shelf/shelf_layout_manager.h" 9 #include "ash/shelf/shelf_layout_manager.h"
10 #include "ash/shelf/shelf_types.h" 10 #include "ash/shelf/shelf_types.h"
(...skipping 27 matching lines...) Expand all
38 return false; 38 return false;
39 } 39 }
40 40
41 // TODO(oshima): Find the root window controller from event's location. 41 // TODO(oshima): Find the root window controller from event's location.
42 RootWindowController* controller = Shell::GetPrimaryRootWindowController(); 42 RootWindowController* controller = Shell::GetPrimaryRootWindowController();
43 43
44 ShelfLayoutManager* shelf = controller->GetShelfLayoutManager(); 44 ShelfLayoutManager* shelf = controller->GetShelfLayoutManager();
45 45
46 // The gesture are disabled for fullscreen windows that are not in immersive 46 // The gesture are disabled for fullscreen windows that are not in immersive
47 // mode. 47 // mode.
48 const aura::Window* fullscreen = controller->GetFullscreenWindow(); 48 const aura::Window* fullscreen = controller->GetTopmostFullscreenWindow();
49 if (fullscreen && !shelf->FullscreenWithMinimalChrome()) 49 if (fullscreen && !shelf->FullscreenWithMinimalChrome())
50 return false; 50 return false;
51 51
52 if (event.type() == ui::ET_GESTURE_SCROLL_BEGIN) { 52 if (event.type() == ui::ET_GESTURE_SCROLL_BEGIN) {
53 drag_in_progress_ = true; 53 drag_in_progress_ = true;
54 shelf->StartGestureDrag(event); 54 shelf->StartGestureDrag(event);
55 return true; 55 return true;
56 } 56 }
57 57
58 if (!drag_in_progress_) 58 if (!drag_in_progress_)
(...skipping 24 matching lines...) Expand all
83 return true; 83 return true;
84 } 84 }
85 85
86 // Unexpected event. Reset the state and let the event fall through. 86 // Unexpected event. Reset the state and let the event fall through.
87 shelf->CancelGestureDrag(); 87 shelf->CancelGestureDrag();
88 return false; 88 return false;
89 } 89 }
90 90
91 } // namespace internal 91 } // namespace internal
92 } // namespace ash 92 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shelf/shelf_layout_manager.cc ('k') | chrome/browser/fullscreen_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698