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

Side by Side Diff: ash/common/shelf/shelf_constants.cc

Issue 2332393003: mash: Remove shelf util functions; use WmWindow properties. (Closed)
Patch Set: Cleanup,. Created 4 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/common/shelf/shelf_constants.h" 5 #include "ash/common/shelf/shelf_constants.h"
6 6
7 #include "ash/common/material_design/material_design_controller.h" 7 #include "ash/common/material_design/material_design_controller.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "third_party/skia/include/core/SkColor.h" 9 #include "third_party/skia/include/core/SkColor.h"
10 10
11 namespace ash { 11 namespace ash {
12 12
13 const int kInvalidImageResourceID = -1;
14 const int kTimeToSwitchBackgroundMs = 1000; 13 const int kTimeToSwitchBackgroundMs = 1000;
15 const int kWorkspaceAreaVisibleInset = 2; 14 const int kWorkspaceAreaVisibleInset = 2;
16 const int kWorkspaceAreaAutoHideInset = 5; 15 const int kWorkspaceAreaAutoHideInset = 5;
17 const int kShelfAutoHideSize = 3; 16 const int kShelfAutoHideSize = 3;
18 const int kShelfItemInset = 3; 17 const int kShelfItemInset = 3;
19 const SkColor kShelfBaseColor = SK_ColorBLACK; 18 const SkColor kShelfBaseColor = SK_ColorBLACK;
20 const SkColor kShelfButtonActivatedHighlightColor = 19 const SkColor kShelfButtonActivatedHighlightColor =
21 SkColorSetA(SK_ColorWHITE, 100); 20 SkColorSetA(SK_ColorWHITE, 100);
22 const SkColor kShelfInkDropBaseColor = SK_ColorWHITE; 21 const SkColor kShelfInkDropBaseColor = SK_ColorWHITE;
23 const float kShelfInkDropVisibleOpacity = 0.2f; 22 const float kShelfInkDropVisibleOpacity = 0.2f;
(...skipping 23 matching lines...) Expand all
47 case SHELF_BUTTON_SIZE: 46 case SHELF_BUTTON_SIZE:
48 return kShelfButtonSize[mode]; 47 return kShelfButtonSize[mode];
49 case SHELF_INSETS_FOR_AUTO_HIDE: 48 case SHELF_INSETS_FOR_AUTO_HIDE:
50 return kShelfInsetsForAutoHide[mode]; 49 return kShelfInsetsForAutoHide[mode];
51 } 50 }
52 NOTREACHED(); 51 NOTREACHED();
53 return 0; 52 return 0;
54 } 53 }
55 54
56 } // namespace ash 55 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698