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

Side by Side Diff: ash/system/tray/fixed_sized_image_view.cc

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/fixed_sized_image_view.h ('k') | ash/system/tray/fixed_sized_scroll_view.h » ('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 #include "ash/system/tray/fixed_sized_image_view.h" 5 #include "ash/system/tray/fixed_sized_image_view.h"
6 6
7 namespace ash { 7 namespace ash {
8 8
9 FixedSizedImageView::FixedSizedImageView(int width, int height) 9 FixedSizedImageView::FixedSizedImageView(int width, int height)
10 : width_(width), 10 : width_(width),
11 height_(height) { 11 height_(height) {
12 SetHorizontalAlignment(views::ImageView::CENTER); 12 SetHorizontalAlignment(views::ImageView::CENTER);
13 SetVerticalAlignment(views::ImageView::CENTER); 13 SetVerticalAlignment(views::ImageView::CENTER);
14 } 14 }
15 15
16 FixedSizedImageView::~FixedSizedImageView() { 16 FixedSizedImageView::~FixedSizedImageView() {
17 } 17 }
18 18
19 gfx::Size FixedSizedImageView::GetPreferredSize() { 19 gfx::Size FixedSizedImageView::GetPreferredSize() const {
20 gfx::Size size = views::ImageView::GetPreferredSize(); 20 gfx::Size size = views::ImageView::GetPreferredSize();
21 return gfx::Size(width_ ? width_ : size.width(), 21 return gfx::Size(width_ ? width_ : size.width(),
22 height_ ? height_ : size.height()); 22 height_ ? height_ : size.height());
23 } 23 }
24 24
25 } // namespace ash 25 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/tray/fixed_sized_image_view.h ('k') | ash/system/tray/fixed_sized_scroll_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698