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

Unified Diff: ash/common/shelf/shelf_constants.h

Issue 2679133003: [ash-md] Wired in the Shelf color to be derived from the Wallpaper. (Closed)
Patch Set: Addressed nits. Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/shelf/shelf_background_animator_unittest.cc ('k') | ash/common/shelf/shelf_constants.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/shelf/shelf_constants.h
diff --git a/ash/common/shelf/shelf_constants.h b/ash/common/shelf/shelf_constants.h
index f875900a8c9facd8aebe500159d47a87286f6bc4..e931194d5637b72e54f19a9c8af0637cd51b29aa 100644
--- a/ash/common/shelf/shelf_constants.h
+++ b/ash/common/shelf/shelf_constants.h
@@ -43,9 +43,9 @@ extern const int kShelfItemInset;
// Animation duration for switching black shelf and dock background on and off.
ASH_EXPORT extern const int kTimeToSwitchBackgroundMs;
-// The base color of the shelf to which different alpha values are applied
-// based on the desired shelf opacity level.
-ASH_EXPORT extern const SkColor kShelfBaseColor;
+// The default base color of the shelf to which different alpha values are
+// applied based on the desired shelf opacity level.
+ASH_EXPORT extern const SkColor kShelfDefaultBaseColor;
// Highlight color used for shelf button activated states.
// TODO(bruthig|mohsen): Use of this color is temporary. Draw the active state
« no previous file with comments | « ash/common/shelf/shelf_background_animator_unittest.cc ('k') | ash/common/shelf/shelf_constants.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698