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

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

Issue 2056683003: mash: Move tray_constants.h and FixedSizedImageView to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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
« no previous file with comments | « ash/system/tray/tray_background_view.cc ('k') | ash/system/tray/tray_constants.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/tray_bar_button_with_title.h" 5 #include "ash/system/tray/tray_bar_button_with_title.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "ash/system/tray/tray_constants.h" 9 #include "ash/common/system/tray/tray_constants.h"
10 #include "ui/base/resource/resource_bundle.h" 10 #include "ui/base/resource/resource_bundle.h"
11 #include "ui/gfx/image/image_skia.h" 11 #include "ui/gfx/image/image_skia.h"
12 #include "ui/resources/grit/ui_resources.h" 12 #include "ui/resources/grit/ui_resources.h"
13 #include "ui/views/controls/label.h" 13 #include "ui/views/controls/label.h"
14 #include "ui/views/painter.h" 14 #include "ui/views/painter.h"
15 #include "ui/views/resources/grit/views_resources.h" 15 #include "ui/views/resources/grit/views_resources.h"
16 16
17 namespace ash { 17 namespace ash {
18 namespace { 18 namespace {
19 19
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 // a little bit up to look closer to the bar. 103 // a little bit up to look closer to the bar.
104 gfx::Size title_size = title_->GetPreferredSize(); 104 gfx::Size title_size = title_->GetPreferredSize();
105 title_->SetBounds(rect.x(), 105 title_->SetBounds(rect.x(),
106 bar_image_y + image_height_ - 3, 106 bar_image_y + image_height_ - 3,
107 rect.width(), 107 rect.width(),
108 title_size.height()); 108 title_size.height());
109 } 109 }
110 } 110 }
111 111
112 } // namespace ash 112 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/tray/tray_background_view.cc ('k') | ash/system/tray/tray_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698