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

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

Issue 23928004: ash:Shelf - Update position and hit box of status area. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: maybe 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/overflow_button.cc ('k') | 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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 // user can drag the shelf out. 74 // user can drag the shelf out.
75 static const int kWorkspaceAreaAutoHideInset; 75 static const int kWorkspaceAreaAutoHideInset;
76 76
77 // Size of the shelf when auto-hidden. 77 // Size of the shelf when auto-hidden.
78 static const int kAutoHideSize; 78 static const int kAutoHideSize;
79 79
80 // The size of the shelf when shown (currently only used in alternate 80 // The size of the shelf when shown (currently only used in alternate
81 // settings see ash::switches::UseAlternateShelfLayout). 81 // settings see ash::switches::UseAlternateShelfLayout).
82 static const int kShelfSize; 82 static const int kShelfSize;
83 83
84 // Inset between the inner edge of the shelf (towards centre of screen), and
85 // the launcher items, notifications, status area etc.
86 static const int kShelfItemInset;
87
84 // Returns the preferred size for the shelf (either kLauncherPreferredSize or 88 // Returns the preferred size for the shelf (either kLauncherPreferredSize or
85 // kShelfSize). 89 // kShelfSize).
86 static int GetPreferredShelfSize(); 90 static int GetPreferredShelfSize();
87 91
88 explicit ShelfLayoutManager(ShelfWidget* shelf); 92 explicit ShelfLayoutManager(ShelfWidget* shelf);
89 virtual ~ShelfLayoutManager(); 93 virtual ~ShelfLayoutManager();
90 94
91 // Sets the ShelfAutoHideBehavior. See enum description for details. 95 // Sets the ShelfAutoHideBehavior. See enum description for details.
92 void SetAutoHideBehavior(ShelfAutoHideBehavior behavior); 96 void SetAutoHideBehavior(ShelfAutoHideBehavior behavior);
93 ShelfAutoHideBehavior auto_hide_behavior() const { 97 ShelfAutoHideBehavior auto_hide_behavior() const {
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 // The bounds of the dock. 405 // The bounds of the dock.
402 gfx::Rect dock_bounds_; 406 gfx::Rect dock_bounds_;
403 407
404 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager); 408 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
405 }; 409 };
406 410
407 } // namespace internal 411 } // namespace internal
408 } // namespace ash 412 } // namespace ash
409 413
410 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ 414 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
OLDNEW
« no previous file with comments | « ash/shelf/overflow_button.cc ('k') | ash/shelf/shelf_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698