Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(221)

Side by Side Diff: ash/system/tray/tray_bar_button_with_title.h

Issue 273223002: views: Make view::Views::GetPreferredSize() const. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More compile fix for ToT Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/system/tray/tray_background_view.cc ('k') | ash/system/tray/tray_bar_button_with_title.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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_
OLDNEW
« no previous file with comments | « ash/system/tray/tray_background_view.cc ('k') | ash/system/tray/tray_bar_button_with_title.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698