| OLD | NEW | 
|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #ifndef ASH_SYSTEM_TRAY_TRAY_BAR_BUTTON_WITH_TITLE_H_ | 5 #ifndef ASH_SYSTEM_TRAY_TRAY_BAR_BUTTON_WITH_TITLE_H_ | 
| 6 #define ASH_SYSTEM_TRAY_TRAY_BAR_BUTTON_WITH_TITLE_H_ | 6 #define ASH_SYSTEM_TRAY_TRAY_BAR_BUTTON_WITH_TITLE_H_ | 
| 7 | 7 | 
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" | 
| 9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" | 
| 10 #include "ui/views/controls/button/custom_button.h" | 10 #include "ui/views/controls/button/custom_button.h" | 
| (...skipping 13 matching lines...) Expand all  Loading... | 
| 24                          int title_id, | 24                          int title_id, | 
| 25                          int width); | 25                          int width); | 
| 26   virtual ~TrayBarButtonWithTitle(); | 26   virtual ~TrayBarButtonWithTitle(); | 
| 27 | 27 | 
| 28   void UpdateButton(bool control_on); | 28   void UpdateButton(bool control_on); | 
| 29 | 29 | 
| 30  private: | 30  private: | 
| 31   class TrayBarButton; | 31   class TrayBarButton; | 
| 32 | 32 | 
| 33   // Overridden from views::CustomButton: | 33   // Overridden from views::CustomButton: | 
| 34   virtual gfx::Size GetPreferredSize() OVERRIDE; | 34   virtual gfx::Size GetPreferredSize() const OVERRIDE; | 
| 35   virtual void Layout() OVERRIDE; | 35   virtual void Layout() OVERRIDE; | 
| 36 | 36 | 
| 37   TrayBarButton* image_; | 37   TrayBarButton* image_; | 
| 38   views::Label* title_; | 38   views::Label* title_; | 
| 39   int width_; | 39   int width_; | 
| 40   int image_height_; | 40   int image_height_; | 
| 41 | 41 | 
| 42   DISALLOW_COPY_AND_ASSIGN(TrayBarButtonWithTitle); | 42   DISALLOW_COPY_AND_ASSIGN(TrayBarButtonWithTitle); | 
| 43 }; | 43 }; | 
| 44 | 44 | 
| 45 }  // namespace ash | 45 }  // namespace ash | 
| 46 | 46 | 
| 47 #endif  // ASH_SYSTEM_TRAY_TRAY_BAR_BUTTON_WITH_TITLE_H_ | 47 #endif  // ASH_SYSTEM_TRAY_TRAY_BAR_BUTTON_WITH_TITLE_H_ | 
| OLD | NEW | 
|---|