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

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

Issue 32943006: [Refactor] Replace kFullscreenUsesMinimalChromeKey with WindowState::hide_shelf_when_fullscreen() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 1 month 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 <vector> 8 #include <vector>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 } 205 }
206 206
207 template<typename T> 207 template<typename T>
208 T PrimaryAxisValue(T horizontal, T vertical) const { 208 T PrimaryAxisValue(T horizontal, T vertical) const {
209 return IsHorizontalAlignment() ? horizontal : vertical; 209 return IsHorizontalAlignment() ? horizontal : vertical;
210 } 210 }
211 211
212 // Is the shelf's alignment horizontal? 212 // Is the shelf's alignment horizontal?
213 bool IsHorizontalAlignment() const; 213 bool IsHorizontalAlignment() const;
214 214
215 // Tests if the browser is currently in fullscreen mode with minimal 215 // Returns true if there is a fullscreen window and the shelf needs to be
216 // Chrome. When minimal Chrome is present the shelf should be displayed. 216 // hidden for the topmost fullscreen window.
217 bool FullscreenWithMinimalChrome() const; 217 bool FullscreenWithHiddenShelf() const;
218 218
219 // Returns a ShelfLayoutManager on the display which has a launcher for 219 // Returns a ShelfLayoutManager on the display which has a launcher for
220 // given |window|. See RootWindowController::ForLauncher for more info. 220 // given |window|. See RootWindowController::ForLauncher for more info.
221 static ShelfLayoutManager* ForLauncher(aura::Window* window); 221 static ShelfLayoutManager* ForLauncher(aura::Window* window);
222 222
223 private: 223 private:
224 class AutoHideEventFilter; 224 class AutoHideEventFilter;
225 class UpdateShelfObserver; 225 class UpdateShelfObserver;
226 friend class ash::ScreenAsh; 226 friend class ash::ScreenAsh;
227 friend class PanelLayoutManagerTest; 227 friend class PanelLayoutManagerTest;
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 // The bounds of the dock. 407 // The bounds of the dock.
408 gfx::Rect dock_bounds_; 408 gfx::Rect dock_bounds_;
409 409
410 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager); 410 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
411 }; 411 };
412 412
413 } // namespace internal 413 } // namespace internal
414 } // namespace ash 414 } // namespace ash
415 415
416 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ 416 #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