Merge 53736 - Make theme change notifications auto-propagate through the view...

chrome/browser/views/toolbar_view.h

 // Copyright (c) 2010 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_VIEWS_TOOLBAR_VIEW_H_
 #define CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_
 
 #include <vector>
 
 #include "app/menus/simple_menu_model.h"
@@ skipping 102 matching lines @@
   virtual bool IsCommandIdChecked(int command_id) const;
   virtual bool IsCommandIdEnabled(int command_id) const;
   virtual bool GetAcceleratorForCommandId(int command_id,
                                           menus::Accelerator* accelerator);
   virtual void ExecuteCommand(int command_id);
 
   // Overridden from views::View:
   virtual gfx::Size GetPreferredSize();
   virtual void Layout();
   virtual void Paint(gfx::Canvas* canvas);
-  virtual void ThemeChanged();
+  virtual void OnThemeChanged();
 
  protected:
 
   // Overridden from AccessibleToolbarView
   virtual views::View* GetDefaultFocusableChild();
   virtual void RemoveToolbarFocus();
 
  private:
   // Returns the number of pixels above the location bar in non-normal display.
   int PopupTopSpacing() const;
@@ skipping 81 matching lines @@
   // running.
   bool* destroyed_flag_;
 
   // When collapsed, the toolbar is just a tiny strip, no controls are visible.
   bool collapsed_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_