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

Side by Side Diff: ash/system/audio/tray_audio.cc

Issue 470663002: ash: Remove a few unused includes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « ash/shell/context_menu.cc ('k') | ash/system/chromeos/network/tray_vpn.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 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/tray_audio.h" 5 #include "ash/system/audio/tray_audio.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 8
9 #include "ash/ash_constants.h" 9 #include "ash/ash_constants.h"
10 #include "ash/metrics/user_metrics_recorder.h" 10 #include "ash/metrics/user_metrics_recorder.h"
11 #include "ash/shell.h" 11 #include "ash/shell.h"
12 #include "ash/system/audio/tray_audio_delegate.h" 12 #include "ash/system/audio/tray_audio_delegate.h"
13 #include "ash/system/audio/volume_view.h" 13 #include "ash/system/audio/volume_view.h"
14 #include "ash/system/tray/actionable_view.h" 14 #include "ash/system/tray/actionable_view.h"
15 #include "ash/system/tray/fixed_sized_scroll_view.h" 15 #include "ash/system/tray/fixed_sized_scroll_view.h"
16 #include "ash/system/tray/hover_highlight_view.h" 16 #include "ash/system/tray/hover_highlight_view.h"
17 #include "ash/system/tray/system_tray.h" 17 #include "ash/system/tray/system_tray.h"
18 #include "ash/system/tray/system_tray_delegate.h" 18 #include "ash/system/tray/system_tray_delegate.h"
19 #include "ash/system/tray/system_tray_notifier.h" 19 #include "ash/system/tray/system_tray_notifier.h"
20 #include "ash/system/tray/tray_constants.h" 20 #include "ash/system/tray/tray_constants.h"
21 #include "ash/volume_control_delegate.h" 21 #include "ash/volume_control_delegate.h"
22 #include "base/strings/utf_string_conversions.h" 22 #include "base/strings/utf_string_conversions.h"
23 #include "grit/ash_resources.h" 23 #include "grit/ash_resources.h"
24 #include "grit/ash_strings.h" 24 #include "grit/ash_strings.h"
25 #include "third_party/skia/include/core/SkCanvas.h" 25 #include "third_party/skia/include/core/SkCanvas.h"
26 #include "third_party/skia/include/core/SkPaint.h" 26 #include "third_party/skia/include/core/SkPaint.h"
27 #include "third_party/skia/include/core/SkRect.h" 27 #include "third_party/skia/include/core/SkRect.h"
28 #include "third_party/skia/include/effects/SkGradientShader.h" 28 #include "third_party/skia/include/effects/SkGradientShader.h"
29 #include "ui/base/l10n/l10n_util.h"
30 #include "ui/base/resource/resource_bundle.h"
31 #include "ui/gfx/canvas.h" 29 #include "ui/gfx/canvas.h"
32 #include "ui/gfx/font_list.h" 30 #include "ui/gfx/font_list.h"
33 #include "ui/gfx/image/image.h" 31 #include "ui/gfx/image/image.h"
34 #include "ui/gfx/image/image_skia_operations.h" 32 #include "ui/gfx/image/image_skia_operations.h"
35 #include "ui/views/controls/button/image_button.h" 33 #include "ui/views/controls/button/image_button.h"
36 #include "ui/views/controls/image_view.h" 34 #include "ui/views/controls/image_view.h"
37 #include "ui/views/controls/label.h" 35 #include "ui/views/controls/label.h"
38 #include "ui/views/controls/slider.h" 36 #include "ui/views/controls/slider.h"
39 #include "ui/views/layout/box_layout.h" 37 #include "ui/views/layout/box_layout.h"
40 #include "ui/views/view.h" 38 #include "ui/views/view.h"
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 if (tray_view()) 138 if (tray_view())
141 tray_view()->SetVisible(GetInitialVisibility()); 139 tray_view()->SetVisible(GetInitialVisibility());
142 if (volume_view_) { 140 if (volume_view_) {
143 volume_view_->SetVolumeLevel( 141 volume_view_->SetVolumeLevel(
144 static_cast<float>(audio_delegate_->GetOutputVolumeLevel()) / 100.0f); 142 static_cast<float>(audio_delegate_->GetOutputVolumeLevel()) / 100.0f);
145 volume_view_->Update(); 143 volume_view_->Update();
146 } 144 }
147 } 145 }
148 146
149 } // namespace ash 147 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell/context_menu.cc ('k') | ash/system/chromeos/network/tray_vpn.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698