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

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

Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)
Patch Set: rebase Created 3 years, 9 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_utils.h ('k') | ash/system/tray/tri_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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/tray_utils.h" 5 #include "ash/system/tray/tray_utils.h"
6 6
7 #include "ash/common/material_design/material_design_controller.h" 7 #include "ash/common/material_design/material_design_controller.h"
8 #include "ash/common/shelf/wm_shelf_util.h" 8 #include "ash/common/shelf/wm_shelf_util.h"
9 #include "ash/common/system/tray/tray_constants.h" 9 #include "ash/system/tray/tray_constants.h"
10 #include "ash/common/system/tray/tray_item_view.h" 10 #include "ash/system/tray/tray_item_view.h"
11 #include "ui/accessibility/ax_node_data.h" 11 #include "ui/accessibility/ax_node_data.h"
12 #include "ui/gfx/font_list.h" 12 #include "ui/gfx/font_list.h"
13 #include "ui/gfx/geometry/vector2d.h" 13 #include "ui/gfx/geometry/vector2d.h"
14 #include "ui/views/border.h" 14 #include "ui/views/border.h"
15 #include "ui/views/controls/button/label_button.h" 15 #include "ui/views/controls/button/label_button.h"
16 #include "ui/views/controls/button/md_text_button.h" 16 #include "ui/views/controls/button/md_text_button.h"
17 #include "ui/views/controls/label.h" 17 #include "ui/views/controls/label.h"
18 18
19 namespace ash { 19 namespace ash {
20 20
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 std::max(0, (tray_view->GetPreferredSize().width() - 65 std::max(0, (tray_view->GetPreferredSize().width() -
66 tray_view->label()->GetPreferredSize().width()) / 66 tray_view->label()->GetPreferredSize().width()) /
67 2); 67 2);
68 tray_view->SetBorder(views::CreateEmptyBorder( 68 tray_view->SetBorder(views::CreateEmptyBorder(
69 kTrayLabelItemVerticalPaddingVerticalAlignment, horizontal_padding, 69 kTrayLabelItemVerticalPaddingVerticalAlignment, horizontal_padding,
70 kTrayLabelItemVerticalPaddingVerticalAlignment, horizontal_padding)); 70 kTrayLabelItemVerticalPaddingVerticalAlignment, horizontal_padding));
71 } 71 }
72 } 72 }
73 73
74 } // namespace ash 74 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/tray/tray_utils.h ('k') | ash/system/tray/tri_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698