| 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 #include "ash/common/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), height_(height) {} | 10 : width_(width), height_(height) {} |
| 11 | 11 |
| 12 FixedSizedImageView::~FixedSizedImageView() {} | 12 FixedSizedImageView::~FixedSizedImageView() {} |
| 13 | 13 |
| 14 gfx::Size FixedSizedImageView::GetPreferredSize() const { | 14 gfx::Size FixedSizedImageView::GetPreferredSize() const { |
| 15 gfx::Size size = views::ImageView::GetPreferredSize(); | 15 gfx::Size size = views::ImageView::GetPreferredSize(); |
| 16 return gfx::Size(width_ ? width_ : size.width(), | 16 return gfx::Size(width_ ? width_ : size.width(), |
| 17 height_ ? height_ : size.height()); | 17 height_ ? height_ : size.height()); |
| 18 } | 18 } |
| 19 | 19 |
| 20 } // namespace ash | 20 } // namespace ash |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2732813002:
chromeos: Move files in //ash/common to //ash, part 1 (Closed)
