[reland] Makes MaterialDesignController initialization explicit

chrome/browser/ui/libgtk2ui/gtk2_ui.h

Index: chrome/browser/ui/libgtk2ui/gtk2_ui.h
diff --git a/chrome/browser/ui/libgtk2ui/gtk2_ui.h b/chrome/browser/ui/libgtk2ui/gtk2_ui.h
index 2f64ce2fe89f283d64eb1a9668807586ef2d35a1..db62cf3fb9eabd85d9a24b985d0a8f1508ada4e8 100644
--- a/chrome/browser/ui/libgtk2ui/gtk2_ui.h
+++ b/chrome/browser/ui/libgtk2ui/gtk2_ui.h
@@ -73,6 +73,9 @@ class Gtk2UI : public views::LinuxUI {
 
   // ui::LinuxUI:
   void Initialize() override;
+  // TODO(varkha): This should not be necessary once Material Design is on
+  // unconditionally.
+  void MaterialDesignControllerReady() override;
   gfx::Image GetThemeImageNamed(int id) const override;
   bool GetTint(int id, color_utils::HSL* tint) const override;
   bool GetColor(int id, SkColor* color) const override;
@@ -130,6 +133,11 @@ class Gtk2UI : public views::LinuxUI {
   // ThemeService interface and the colors we send to webkit.
   void LoadGtkValues();
 
+  // Updates colors if necessary after possible modification of command line.
+  // TODO(varkha): This should not be necessary once Material Design is on
+  // unconditionally.
+  void UpdateMaterialDesignColors();
+
   // Reads in explicit theme frame colors from the ChromeGtkFrame style class
   // or generates them per our fallback algorithm.
   SkColor BuildFrameColors();