OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/audio/volume_view.h" | 5 #include "ash/common/system/audio/volume_view.h" |
6 | 6 |
7 #include "ash/common/ash_constants.h" | 7 #include "ash/common/ash_constants.h" |
8 #include "ash/common/metrics/user_metrics_action.h" | 8 #include "ash/common/metrics/user_metrics_action.h" |
9 #include "ash/common/system/audio/tray_audio.h" | 9 #include "ash/common/system/audio/tray_audio.h" |
10 #include "ash/common/system/audio/tray_audio_delegate.h" | 10 #include "ash/common/system/audio/tray_audio_delegate.h" |
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
135 views::Border::CreateEmptyBorder(0, 0, 0, kTrayPopupPaddingBetweenItems)); | 135 views::Border::CreateEmptyBorder(0, 0, 0, kTrayPopupPaddingBetweenItems)); |
136 AddChildView(slider_); | 136 AddChildView(slider_); |
137 box_layout->SetFlexForView(slider_, 1); | 137 box_layout->SetFlexForView(slider_, 1); |
138 | 138 |
139 separator_ = new views::Separator(views::Separator::VERTICAL); | 139 separator_ = new views::Separator(views::Separator::VERTICAL); |
140 separator_->SetColor(kButtonStrokeColor); | 140 separator_->SetColor(kButtonStrokeColor); |
141 separator_->SetPreferredSize(kSeparatorSize); | 141 separator_->SetPreferredSize(kSeparatorSize); |
142 separator_->SetBorder(views::Border::CreateEmptyBorder( | 142 separator_->SetBorder(views::Border::CreateEmptyBorder( |
143 kSeparatorVerticalInset, 0, kSeparatorVerticalInset, kBoxLayoutPadding)); | 143 kSeparatorVerticalInset, 0, kSeparatorVerticalInset, kBoxLayoutPadding)); |
144 | 144 |
145 more_region_ = new TrayPopupItemContainer(separator_, true, false); | 145 more_region_ = new TrayPopupItemContainer(separator_, true); |
146 more_region_->SetBorder( | 146 more_region_->SetBorder( |
147 views::Border::CreateEmptyBorder(0, 0, 0, kTrayPopupPaddingBetweenItems)); | 147 views::Border::CreateEmptyBorder(0, 0, 0, kTrayPopupPaddingBetweenItems)); |
148 AddChildView(more_region_); | 148 AddChildView(more_region_); |
149 | 149 |
150 device_type_ = new views::ImageView; | 150 device_type_ = new views::ImageView; |
151 more_region_->AddChildView(device_type_); | 151 more_region_->AddChildView(device_type_); |
152 | 152 |
153 more_ = new views::ImageView; | 153 more_ = new views::ImageView; |
154 more_->EnableCanvasFlippingForRTLUI(true); | 154 more_->EnableCanvasFlippingForRTLUI(true); |
155 more_->SetImage(ui::ResourceBundle::GetSharedInstance() | 155 more_->SetImage(ui::ResourceBundle::GetSharedInstance() |
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
280 separator_->SetSize(gfx::Size(kSeparatorSize, bounds().height())); | 280 separator_->SetSize(gfx::Size(kSeparatorSize, bounds().height())); |
281 } | 281 } |
282 | 282 |
283 void VolumeView::GetAccessibleState(ui::AXViewState* state) { | 283 void VolumeView::GetAccessibleState(ui::AXViewState* state) { |
284 // Intentionally overrides ActionableView, leaving |state| unset. A slider | 284 // Intentionally overrides ActionableView, leaving |state| unset. A slider |
285 // childview exposes accessibility data. | 285 // childview exposes accessibility data. |
286 } | 286 } |
287 | 287 |
288 } // namespace tray | 288 } // namespace tray |
289 } // namespace ash | 289 } // namespace ash |
OLD | NEW |