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

Side by Side Diff: ash/system/tray/fixed_sized_image_view.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/drive/tray_drive.cc ('k') | ash/system/tray/fixed_sized_image_view.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_FIXED_SIZED_IMAGE_VIEW_H_ 5 #ifndef ASH_SYSTEM_TRAY_FIXED_SIZED_IMAGE_VIEW_H_
6 #define ASH_SYSTEM_TRAY_FIXED_SIZED_IMAGE_VIEW_H_ 6 #define ASH_SYSTEM_TRAY_FIXED_SIZED_IMAGE_VIEW_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/image_view.h" 10 #include "ui/views/controls/image_view.h"
11 11
12 namespace ash { 12 namespace ash {
13 13
14 // An image view with a specified width and height (kTrayPopupDetailsIconWidth). 14 // An image view with a specified width and height (kTrayPopupDetailsIconWidth).
15 // If the specified width or height is zero, then the image size is used for 15 // If the specified width or height is zero, then the image size is used for
16 // that dimension. 16 // that dimension.
17 class FixedSizedImageView : public views::ImageView { 17 class FixedSizedImageView : public views::ImageView {
18 public: 18 public:
19 FixedSizedImageView(int width, int height); 19 FixedSizedImageView(int width, int height);
20 virtual ~FixedSizedImageView(); 20 virtual ~FixedSizedImageView();
21 21
22 private: 22 private:
23 virtual gfx::Size GetPreferredSize() OVERRIDE; 23 virtual gfx::Size GetPreferredSize() const OVERRIDE;
24 24
25 int width_; 25 int width_;
26 int height_; 26 int height_;
27 27
28 DISALLOW_COPY_AND_ASSIGN(FixedSizedImageView); 28 DISALLOW_COPY_AND_ASSIGN(FixedSizedImageView);
29 }; 29 };
30 30
31 } // namespace ash 31 } // namespace ash
32 32
33 #endif // ASH_SYSTEM_TRAY_FIXED_SIZED_IMAGE_VIEW_H_ 33 #endif // ASH_SYSTEM_TRAY_FIXED_SIZED_IMAGE_VIEW_H_
OLDNEW
« no previous file with comments | « ash/system/drive/tray_drive.cc ('k') | ash/system/tray/fixed_sized_image_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698