ToolbarView MaterialDesign in ThemeProvider

chrome/browser/themes/theme_properties.h

 // 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.
 
 #ifndef CHROME_BROWSER_THEMES_THEME_PROPERTIES_H_
 #define CHROME_BROWSER_THEMES_THEME_PROPERTIES_H_
 
 #include <set>
 #include <string>
 
@@ skipping 93 matching lines @@
     COLOR_TOOLBAR_STROKE_INACTIVE,
     COLOR_TOOLBAR_BUTTON_STROKE,
     COLOR_TOOLBAR_BUTTON_STROKE_INACTIVE,
     GRADIENT_FRAME_INCOGNITO,
     GRADIENT_FRAME_INCOGNITO_INACTIVE,
     GRADIENT_TOOLBAR,
     GRADIENT_TOOLBAR_INACTIVE,
     GRADIENT_TOOLBAR_BUTTON,
     GRADIENT_TOOLBAR_BUTTON_INACTIVE,
     GRADIENT_TOOLBAR_BUTTON_PRESSED,
-    GRADIENT_TOOLBAR_BUTTON_PRESSED_INACTIVE
+    GRADIENT_TOOLBAR_BUTTON_PRESSED_INACTIVE,
 #endif  // OS_MACOSX
+
+    // Layout Properties for the Toolbar

[pkotwicz, 2015/07/03 15:39:22]

Can you add a TODO to remove all of these properties from this file once Chrome
is 100% switched over to material design?

It might be useful if you started a new enum "MaterialDesignDisplayProperty"
perhaps. The benefit is that in theme_properties.cc you could get rid of a few
default cases in the switch statements. In particular:

int ThemeProperties::GetDefaultDisplayProperty(int id) {
  if (id >= MATERIAL_DESIGN_DISPLAY_PROPERTY_FIRST &&
      id <= MATERIAL_DESIGN_DISPLAY_PROPERTY_LAST) {
     MaterialDesignDisplayProperty material_property =
static_cast<MaterialDesignDisplayProperty>(id);
      ...
  }
  ...
}

[jonross, 2015/07/03 17:09:31]

These might remain after we complete the implementation and remove the current
defaults. We plan to test a normal Material Design layout, along with one for
touch centric CrOS devices.

I can move these values to their own enum, however we will still be switching in
GetDefaultDisplayProperties based on the current mode of the
MaterialDesignController. So it is not just a direct switch->if change.

+    PROPERTY_TOOLBAR_VIEW_LEFT_EDGE_SPACING,
+    PROPERTY_TOOLBAR_VIEW_RIGHT_EDGE_SPACING,
+    PROPERTY_TOOLBAR_VIEW_CONTENT_SHADOW_HEIGHT_ASH,
+    PROPERTY_TOOLBAR_VIEW_CONTENT_SHADOW_HEIGHT,
   };
 
   // Used by the browser theme pack to parse alignments from something like
   // "top left" into a bitmask of Alignment.
   static int StringToAlignment(const std::string& alignment);
 
   // Used by the browser theme pack to parse alignments from something like
   // "no-repeat" into a Tiling value.
   static int StringToTiling(const std::string& tiling);
 
@@ skipping 19 matching lines @@
 
   // Returns the default value for the given property |id|. Returns -1 if |id|
   // is invalid.
   static int GetDefaultDisplayProperty(int id);
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(ThemeProperties);
 };
 
 #endif  // CHROME_BROWSER_THEMES_THEME_PROPERTIES_H_