| 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/system/tray/fixed_sized_image_view.h" | 5 #include "ash/common/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() const { | 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 |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2056683003:
mash: Move tray_constants.h and FixedSizedImageView to //ash/common (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master