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

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

Issue 140323010: Ash:Shelf - Cleanup of Alternate Shelf (part 1) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase + remove AlternateShelf from variable names Created 6 years, 11 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
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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 // the resize handle at the edge of the window can be hit. 70 // the resize handle at the edge of the window can be hit.
71 static const int kWorkspaceAreaVisibleInset; 71 static const int kWorkspaceAreaVisibleInset;
72 72
73 // When autohidden we extend the touch hit target onto the screen so that the 73 // When autohidden we extend the touch hit target onto the screen so that the
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.
81 // settings see ash::switches::UseAlternateShelfLayout).
82 static const int kShelfSize; 81 static const int kShelfSize;
83 82
84 // Inset between the inner edge of the shelf (towards centre of screen), and 83 // Inset between the inner edge of the shelf (towards centre of screen), and
85 // the shelf items, notifications, status area etc. 84 // the shelf items, notifications, status area etc.
86 static const int kShelfItemInset; 85 static const int kShelfItemInset;
87 86
88 // Returns the preferred size for the shelf (either kShelfPreferredSize or 87 // Returns the preferred size for the shelf (either kShelfPreferredSize or
89 // kShelfSize). 88 // kShelfSize).
90 static int GetPreferredShelfSize(); 89 static int GetPreferredShelfSize();
91 90
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
408 // The bounds of the dock. 407 // The bounds of the dock.
409 gfx::Rect dock_bounds_; 408 gfx::Rect dock_bounds_;
410 409
411 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager); 410 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
412 }; 411 };
413 412
414 } // namespace internal 413 } // namespace internal
415 } // namespace ash 414 } // namespace ash
416 415
417 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ 416 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698