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

Side by Side Diff: ash/common/system/tray/tray_popup_utils.cc

Issue 2457393006: [ash-md] Added ink drop to system menu rows that inherit from ActionableView. (Closed)
Patch Set: Fixed the failing test: 'SpokenFeedbackTest.NavigateSystemTray' Created 4 years, 1 month 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/common/system/tray/tray_item_more.cc ('k') | ash/common/system/update/tray_update.cc » ('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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_popup_utils.h" 5 #include "ash/common/system/tray/tray_popup_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/system/tray/fixed_sized_image_view.h" 8 #include "ash/common/system/tray/fixed_sized_image_view.h"
9 #include "ash/common/system/tray/tray_constants.h" 9 #include "ash/common/system/tray/tray_constants.h"
10 #include "ash/common/system/tray/tray_popup_label_button.h" 10 #include "ash/common/system/tray/tray_popup_label_button.h"
(...skipping 21 matching lines...) Expand all
32 } 32 }
33 33
34 // Creates a layout manager that positions Views horizontally. The Views will be 34 // Creates a layout manager that positions Views horizontally. The Views will be
35 // centered along the horizontal and vertical axis. 35 // centered along the horizontal and vertical axis.
36 std::unique_ptr<views::LayoutManager> CreateDefaultEndsLayoutManager() { 36 std::unique_ptr<views::LayoutManager> CreateDefaultEndsLayoutManager() {
37 views::BoxLayout* box_layout = 37 views::BoxLayout* box_layout =
38 new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0); 38 new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0);
39 box_layout->set_main_axis_alignment( 39 box_layout->set_main_axis_alignment(
40 views::BoxLayout::MAIN_AXIS_ALIGNMENT_CENTER); 40 views::BoxLayout::MAIN_AXIS_ALIGNMENT_CENTER);
41 box_layout->set_cross_axis_alignment( 41 box_layout->set_cross_axis_alignment(
42 views::BoxLayout::CROSS_AXIS_ALIGNMENT_CENTER); 42 views::BoxLayout::CROSS_AXIS_ALIGNMENT_STRETCH);
43 return std::unique_ptr<views::LayoutManager>(box_layout); 43 return std::unique_ptr<views::LayoutManager>(box_layout);
44 } 44 }
45 45
46 } // namespace 46 } // namespace
47 47
48 TriView* TrayPopupUtils::CreateDefaultRowView() { 48 TriView* TrayPopupUtils::CreateDefaultRowView() {
49 TriView* tri_view = new TriView(0 /* padding_between_items */); 49 TriView* tri_view = new TriView(0 /* padding_between_items */);
50 50
51 tri_view->SetInsets( 51 tri_view->SetInsets(
52 gfx::Insets(0, GetTrayConstant(TRAY_POPUP_ITEM_LEFT_INSET), 0, 52 gfx::Insets(0, GetTrayConstant(TRAY_POPUP_ITEM_LEFT_INSET), 0,
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 tri_view->SetMinSize( 112 tri_view->SetMinSize(
113 TriView::Container::END, 113 TriView::Container::END,
114 gfx::Size(GetTrayConstant(TRAY_POPUP_ITEM_MIN_END_WIDTH), 0)); 114 gfx::Size(GetTrayConstant(TRAY_POPUP_ITEM_MIN_END_WIDTH), 0));
115 break; 115 break;
116 } 116 }
117 117
118 tri_view->SetContainerLayout(container, CreateLayoutManager(container)); 118 tri_view->SetContainerLayout(container, CreateLayoutManager(container));
119 } 119 }
120 120
121 } // namespace ash 121 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/system/tray/tray_item_more.cc ('k') | ash/common/system/update/tray_update.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698