Makes MaterialDesignController initialization explicit

chrome/browser/ui/libgtk2ui/gtk2_ui.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_UI_LIBGTK2UI_GTK2_UI_H_
 #define CHROME_BROWSER_UI_LIBGTK2UI_GTK2_UI_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 55 matching lines @@
       int* style_out,
       gfx::FontRenderParams* params_out) const override;
 
   // ui::ShellDialogLinux:
   ui::SelectFileDialog* CreateSelectFileDialog(
       ui::SelectFileDialog::Listener* listener,
       ui::SelectFilePolicy* policy) const override;
 
   // ui::LinuxUI:
   void Initialize() override;
+  // TODO(varkha): This should not be necessary once Material Design is on
+  // unconditionally.
+  void UpdateWithLocalState() 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;
   bool HasCustomImage(int id) const override;
   SkColor GetFocusRingColor() const override;
   SkColor GetThumbActiveColor() const override;
   SkColor GetThumbInactiveColor() const override;
   SkColor GetTrackColor() const override;
   SkColor GetActiveSelectionBgColor() const override;
   SkColor GetActiveSelectionFgColor() const override;
@@ skipping 37 matching lines @@
 
   // This method returns the colors webkit will use for the scrollbars. When no
   // colors are specified by the GTK+ theme, this function averages of the
   // thumb part and of the track colors.
   void SetScrollbarColors();
 
   // Extracts colors and tints from the GTK theme, both for the
   // 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 UpdateColors();

[Evan Stade, 2016/04/08 21:14:11]

s/UpdateColors/UpdateMaterialDesignColors/

[varkha, 2016/04/08 23:27:07]

Done.

+
   // Reads in explicit theme frame colors from the ChromeGtkFrame style class
   // or generates them per our fallback algorithm.
   SkColor BuildFrameColors();
 
   // Gets a tint which depends on the default for |id| as well as |color|.
   color_utils::HSL ColorToTint(int id, SkColor color);
 
   // Lazily generates each image used in the gtk theme.
   gfx::Image GenerateGtkThemeImage(int id) const;
   SkBitmap GenerateGtkThemeBitmap(int id) const;
@@ skipping 94 matching lines @@
 }  // namespace libgtk2ui
 
 // Access point to the GTK2 desktop system. This should be the only symbol that
 // is exported in the library; everything else should be used through the
 // interface, because eventually this .so will be loaded through dlopen at
 // runtime so our main binary can conditionally load GTK2 or GTK3 or EFL or
 // QT or whatever.
 LIBGTK2UI_EXPORT views::LinuxUI* BuildGtk2UI();
 
 #endif  // CHROME_BROWSER_UI_LIBGTK2UI_GTK2_UI_H_