ToolbarView MaterialDesign in ThemeProvider

chrome/browser/themes/theme_properties.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/themes/theme_properties.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/themes/browser_theme_pack.h"
 #include "grit/theme_resources.h"
+#include "ui/base/resource/material_design/material_design_controller.h"
 #include "ui/resources/grit/ui_resources.h"
 
 namespace {
 
 // ----------------------------------------------------------------------------
 // Defaults for properties which are stored in the browser theme pack. If you
 // change these defaults, you must increment the version number in
 // browser_theme_pack.h
 
 // Default colors.
@@ skipping 67 matching lines @@
 #if defined(OS_MACOSX)
 const SkColor kDefaultColorToolbarButtonStroke = SkColorSetARGB(75, 81, 81, 81);
 const SkColor kDefaultColorToolbarButtonStrokeInactive =
     SkColorSetARGB(75, 99, 99, 99);
 const SkColor kDefaultColorToolbarBezel = SkColorSetRGB(204, 204, 204);
 const SkColor kDefaultColorToolbarStroke = SkColorSetRGB(103, 103, 103);
 const SkColor kDefaultColorToolbarStrokeInactive = SkColorSetRGB(163, 163, 163);
 #endif
 
 // ----------------------------------------------------------------------------
+// Defaults for layout properties which are not stored in the browser theme
+// pack. The array indices here are the values of
+// ui::MaterialDesignController::Mode, see
+// ui/base/resource/material_design/material_design_controller.h
+COMPILE_ASSERT(

[Peter Kasting, 2015/07/08 21:18:42]

I think these compile asserts are more big and ugly than helpful.  They also
don't catch adding a new value to the end of the enum.  And we're very unlikely
to change the order of things in the enum from now on to begin with; there's no
motivation to do so.

For all these reasons, I would prefer to leave them out.

If you disagree and wish to keep them, then I again suggest changing Mode from
an enum class to a pure enum, so you can remove all the static_casts here at
least.  It makes sense to me to make Mode an enum regardless if we actually
intend to use its values as integral numbers somewhere.

[jonross, 2015/07/08 22:30:43]

Done.

+    static_cast<int>(ui::MaterialDesignController::Mode::NON_MATERIAL) == 0,
+    material_design_mode_order_changed);
+COMPILE_ASSERT(static_cast<int>(ui::MaterialDesignController::Mode::MATERIAL) ==
+                   1,
+               material_design_mode_order_changed);
+COMPILE_ASSERT(
+    static_cast<int>(ui::MaterialDesignController::Mode::MATERIAL_HYBRID) == 2,
+    material_design_mode_order_changed);
+
+// The edge graphics have some built-in spacing/shadowing, so we have to adjust
+// our spacing to make it match.
+const int kToolbarViewLeftEdgeSpacing[] = {3, 4, 8};
+const int kToolbarViewRightEdgeSpacing[] = {2, 4, 8};
+
+// Ash doesn't use a rounded content area and its top edge has an extra shadow.
+const int kToolbarViewContentShadowHeightAsh[] = {2, 0, 0};
+
+// Non-ash uses a rounded content area with no shadow in the assets.
+const int kToolbarViewContentShadowHeight[] = {0, 0, 0};
+
+// ----------------------------------------------------------------------------
 
 // Strings used in alignment properties.
 const char kAlignmentCenter[] = "center";
 const char kAlignmentTop[] = "top";
 const char kAlignmentBottom[] = "bottom";
 const char kAlignmentLeft[] = "left";
 const char kAlignmentRight[] = "right";
 
 // Strings used in background tiling repetition properties.
 const char kTilingNoRepeat[] = "no-repeat";
@@ skipping 183 matching lines @@
       return kDefaultColorToolbarStrokeInactive;
 #endif
     default:
       // Return a debugging red color.
       return SK_ColorRED;
   }
 }
 
 // static
 int ThemeProperties::GetDefaultDisplayProperty(int id) {
+  int mode = static_cast<int>(ui::MaterialDesignController::GetMode());
   switch (id) {
-    case NTP_BACKGROUND_ALIGNMENT:
+    case ThemeProperties::NTP_BACKGROUND_ALIGNMENT:
       return kDefaultDisplayPropertyNTPAlignment;
-    case NTP_BACKGROUND_TILING:
+    case ThemeProperties::NTP_BACKGROUND_TILING:
       return kDefaultDisplayPropertyNTPTiling;
-    case NTP_LOGO_ALTERNATE:
+    case ThemeProperties::NTP_LOGO_ALTERNATE:
       return kDefaultDisplayPropertyNTPAlternateLogo;
+    case ThemeProperties::PROPERTY_TOOLBAR_VIEW_LEFT_EDGE_SPACING:
+      return kToolbarViewLeftEdgeSpacing[mode];
+    case ThemeProperties::PROPERTY_TOOLBAR_VIEW_RIGHT_EDGE_SPACING:
+      return kToolbarViewRightEdgeSpacing[mode];
+    case ThemeProperties::PROPERTY_TOOLBAR_VIEW_CONTENT_SHADOW_HEIGHT_ASH:
+      return kToolbarViewContentShadowHeightAsh[mode];
+    case ThemeProperties::PROPERTY_TOOLBAR_VIEW_CONTENT_SHADOW_HEIGHT:
+      return kToolbarViewContentShadowHeight[mode];
+    default:
+      return -1;
   }
-
-  return -1;
 }