| 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/system/audio/volume_view.h" | 5 #include "ash/system/audio/volume_view.h" |
| 6 | 6 |
| 7 #include "ash/ash_constants.h" | 7 #include "ash/ash_constants.h" |
| 8 #include "ash/common/system/tray/tray_constants.h" |
| 8 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 9 #include "ash/system/audio/tray_audio.h" | 10 #include "ash/system/audio/tray_audio.h" |
| 10 #include "ash/system/audio/tray_audio_delegate.h" | 11 #include "ash/system/audio/tray_audio_delegate.h" |
| 11 #include "ash/system/tray/system_tray_item.h" | 12 #include "ash/system/tray/system_tray_item.h" |
| 12 #include "ash/system/tray/tray_constants.h" | |
| 13 #include "ash/system/tray/tray_popup_item_container.h" | 13 #include "ash/system/tray/tray_popup_item_container.h" |
| 14 #include "grit/ash_resources.h" | 14 #include "grit/ash_resources.h" |
| 15 #include "grit/ash_strings.h" | 15 #include "grit/ash_strings.h" |
| 16 #include "ui/base/resource/resource_bundle.h" | 16 #include "ui/base/resource/resource_bundle.h" |
| 17 #include "ui/gfx/canvas.h" | 17 #include "ui/gfx/canvas.h" |
| 18 #include "ui/gfx/image/image_skia_operations.h" | 18 #include "ui/gfx/image/image_skia_operations.h" |
| 19 #include "ui/views/background.h" | 19 #include "ui/views/background.h" |
| 20 #include "ui/views/border.h" | 20 #include "ui/views/border.h" |
| 21 #include "ui/views/controls/button/image_button.h" | 21 #include "ui/views/controls/button/image_button.h" |
| 22 #include "ui/views/controls/image_view.h" | 22 #include "ui/views/controls/image_view.h" |
| (...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 278 separator_->SetSize(gfx::Size(kSeparatorSize, bounds().height())); | 278 separator_->SetSize(gfx::Size(kSeparatorSize, bounds().height())); |
| 279 } | 279 } |
| 280 | 280 |
| 281 void VolumeView::GetAccessibleState(ui::AXViewState* state) { | 281 void VolumeView::GetAccessibleState(ui::AXViewState* state) { |
| 282 // Intentionally overrides ActionableView, leaving |state| unset. A slider | 282 // Intentionally overrides ActionableView, leaving |state| unset. A slider |
| 283 // childview exposes accessibility data. | 283 // childview exposes accessibility data. |
| 284 } | 284 } |
| 285 | 285 |
| 286 } // namespace tray | 286 } // namespace tray |
| 287 } // namespace ash | 287 } // namespace ash |
| OLD | NEW |