OLD | NEW |
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/system/audio/tray_volume.h" | 5 #include "ash/system/audio/tray_volume.h" |
6 | 6 |
7 #include <cmath> | 7 #include <cmath> |
8 | 8 |
| 9 #include "ash/ash_constants.h" |
9 #include "ash/shell.h" | 10 #include "ash/shell.h" |
10 #include "ash/system/tray/system_tray_delegate.h" | 11 #include "ash/system/tray/system_tray_delegate.h" |
11 #include "ash/system/tray/tray_constants.h" | 12 #include "ash/system/tray/tray_constants.h" |
12 #include "ash/system/tray/tray_views.h" | 13 #include "ash/system/tray/tray_views.h" |
13 #include "ash/volume_control_delegate.h" | 14 #include "ash/volume_control_delegate.h" |
14 #include "base/utf_string_conversions.h" | 15 #include "base/utf_string_conversions.h" |
15 #include "grit/ash_resources.h" | 16 #include "grit/ash_resources.h" |
16 #include "grit/ash_strings.h" | 17 #include "grit/ash_strings.h" |
17 #include "third_party/skia/include/core/SkCanvas.h" | 18 #include "third_party/skia/include/core/SkCanvas.h" |
18 #include "third_party/skia/include/core/SkPaint.h" | 19 #include "third_party/skia/include/core/SkPaint.h" |
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
270 tray_view()->SetVisible(GetInitialVisibility()); | 271 tray_view()->SetVisible(GetInitialVisibility()); |
271 | 272 |
272 if (volume_view_) | 273 if (volume_view_) |
273 volume_view_->Update(); | 274 volume_view_->Update(); |
274 else | 275 else |
275 PopupDetailedView(kTrayPopupAutoCloseDelayInSeconds, false); | 276 PopupDetailedView(kTrayPopupAutoCloseDelayInSeconds, false); |
276 } | 277 } |
277 | 278 |
278 } // namespace internal | 279 } // namespace internal |
279 } // namespace ash | 280 } // namespace ash |
OLD | NEW |