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

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

Issue 14740012: Enable shelf gestures in immersive mode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Changed method name as requested and removed code duplication Created 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | ash/shelf/shelf_layout_manager.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 #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 "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/launcher/launcher.h" 9 #include "ash/launcher/launcher.h"
10 #include "ash/shelf/background_animator.h" 10 #include "ash/shelf/background_animator.h"
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 } 177 }
178 178
179 template<typename T> 179 template<typename T>
180 T PrimaryAxisValue(T horizontal, T vertical) const { 180 T PrimaryAxisValue(T horizontal, T vertical) const {
181 return IsHorizontalAlignment() ? horizontal : vertical; 181 return IsHorizontalAlignment() ? horizontal : vertical;
182 } 182 }
183 183
184 // Is the shelf's alignment horizontal? 184 // Is the shelf's alignment horizontal?
185 bool IsHorizontalAlignment() const; 185 bool IsHorizontalAlignment() const;
186 186
187 // Tests if the browser is currently in fullscreen mode with minimal
188 // Chrome. When minimal Chrome is present the shelf should be displayed.
189 bool FullscreenWithMinimalChrome() const;
190
187 // Returns a ShelfLayoutManager on the display which has a launcher for 191 // Returns a ShelfLayoutManager on the display which has a launcher for
188 // given |window|. See RootWindowController::ForLauncher for more info. 192 // given |window|. See RootWindowController::ForLauncher for more info.
189 static ShelfLayoutManager* ForLauncher(aura::Window* window); 193 static ShelfLayoutManager* ForLauncher(aura::Window* window);
190 194
191 private: 195 private:
192 class AutoHideEventFilter; 196 class AutoHideEventFilter;
193 class UpdateShelfObserver; 197 class UpdateShelfObserver;
194 friend class ash::ScreenAsh; 198 friend class ash::ScreenAsh;
195 friend class PanelLayoutManagerTest; 199 friend class PanelLayoutManagerTest;
196 friend class ShelfLayoutManagerTest; 200 friend class ShelfLayoutManagerTest;
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 // The bounds of the keyboard. 340 // The bounds of the keyboard.
337 gfx::Rect keyboard_bounds_; 341 gfx::Rect keyboard_bounds_;
338 342
339 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager); 343 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
340 }; 344 };
341 345
342 } // namespace internal 346 } // namespace internal
343 } // namespace ash 347 } // namespace ash
344 348
345 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ 349 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
OLDNEW
« no previous file with comments | « no previous file | ash/shelf/shelf_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698