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

Side by Side Diff: ash/system/tray/tray_constants.cc

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/system/tray/tray_constants.h ('k') | no next file » | 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/system/tray/tray_constants.h" 5 #include "ash/system/tray/tray_constants.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "third_party/skia/include/core/SkColor.h" 8 #include "third_party/skia/include/core/SkColor.h"
9 9
10 namespace ash { 10 namespace ash {
11 11
12 const int kPaddingFromRightEdgeOfScreenBottomAlignment = 7; 12 const int kPaddingFromRightEdgeOfScreenBottomAlignment = 7;
13 const int kPaddingFromBottomOfScreenBottomAlignment = 7; 13 const int kPaddingFromBottomOfScreenBottomAlignment = 7;
14 const int kPaddingFromOuterEdgeOfLauncherVerticalAlignment = 8; 14 const int kPaddingFromOuterEdgeOfLauncherVerticalAlignment = 8;
15 const int kPaddingFromInnerEdgeOfLauncherVerticalAlignment = 9; 15 const int kPaddingFromInnerEdgeOfLauncherVerticalAlignment = 9;
16 const int kPaddingFromBottomOfScreenVerticalAlignment = 10; 16 const int kPaddingFromBottomOfScreenVerticalAlignment = 10;
17 17
18 // Inset between the edge of the shelf region and the status tray. 18 // Padding used to position the system menu relative to the status area.
19 const int kAlternateLayoutBubblePaddingHorizontalBottom = 6;
20 const int kAlternateLayoutBubblePaddingHorizontalSide = 10;
21 const int kAlternateLayoutBubblePaddingVerticalBottom = 3;
22 const int kAlternateLayoutBubblePaddingVerticalSide = 15;
23
19 const int kPaddingFromEdgeOfShelf = 3; 24 const int kPaddingFromEdgeOfShelf = 3;
20 25
21 // Top inset of system tray bubble for bottom anchor alignment. 26 // Top inset of system tray bubble for bottom anchor alignment.
22 const int kTrayBubbleAnchorTopInsetBottomAnchor = 3; 27 const int kTrayBubbleAnchorTopInsetBottomAnchor = 3;
23 28
24 const int kTrayImageItemHorizontalPaddingBottomAlignment = 1; 29 const int kTrayImageItemHorizontalPaddingBottomAlignment = 1;
25 const int kTrayImageItemHorizontalPaddingVerticalAlignment = 1; 30 const int kTrayImageItemHorizontalPaddingVerticalAlignment = 1;
26 const int kTrayImageItemVerticalPaddingVerticalAlignment = 1; 31 const int kTrayImageItemVerticalPaddingVerticalAlignment = 1;
27 32
28 const int kTrayLabelItemHorizontalPaddingBottomAlignment = 7; 33 const int kTrayLabelItemHorizontalPaddingBottomAlignment = 7;
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 return ash::switches::UseAlternateShelfLayout() ? 80 return ash::switches::UseAlternateShelfLayout() ?
76 kAlternateTraySpacing : kTraySpacing; 81 kAlternateTraySpacing : kTraySpacing;
77 } 82 }
78 83
79 int GetShelfItemHeight() { 84 int GetShelfItemHeight() {
80 return ash::switches::UseAlternateShelfLayout() ? 85 return ash::switches::UseAlternateShelfLayout() ?
81 kAlternateShelfItemHeight : kShelfItemHeight; 86 kAlternateShelfItemHeight : kShelfItemHeight;
82 } 87 }
83 88
84 } // namespace ash 89 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/tray/tray_constants.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698