ash/system/audio/tray_audio.cc - Issue 512663002: Cleanup: Remove misc unneeded grit includes.

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

Issue 512663002: Cleanup: Remove misc unneeded grit includes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 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

« no previous file with comments | « ash/shell/shelf_delegate_impl.cc ('k') | ash/system/chromeos/audio/audio_detailed_view.cc » ('j') | no next file with comments »

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/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"

25 #include "third_party/skia/include/core/SkCanvas.h"	24 #include "third_party/skia/include/core/SkCanvas.h"

26 #include "third_party/skia/include/core/SkPaint.h"	25 #include "third_party/skia/include/core/SkPaint.h"

27 #include "third_party/skia/include/core/SkRect.h"	26 #include "third_party/skia/include/core/SkRect.h"

28 #include "third_party/skia/include/effects/SkGradientShader.h"	27 #include "third_party/skia/include/effects/SkGradientShader.h"

29 #include "ui/gfx/canvas.h"	28 #include "ui/gfx/canvas.h"

30 #include "ui/gfx/font_list.h"	29 #include "ui/gfx/font_list.h"

31 #include "ui/gfx/image/image.h"	30 #include "ui/gfx/image/image.h"

32 #include "ui/gfx/image/image_skia_operations.h"	31 #include "ui/gfx/image/image_skia_operations.h"

33 #include "ui/views/controls/button/image_button.h"	32 #include "ui/views/controls/button/image_button.h"

34 #include "ui/views/controls/image_view.h"	33 #include "ui/views/controls/image_view.h"

(...skipping 103 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
138 if (tray_view())	137 if (tray_view())

139 tray_view()->SetVisible(GetInitialVisibility());	138 tray_view()->SetVisible(GetInitialVisibility());

140 if (volume_view_) {	139 if (volume_view_) {

141 volume_view_->SetVolumeLevel(	140 volume_view_->SetVolumeLevel(

142 static_cast<float>(audio_delegate_->GetOutputVolumeLevel()) / 100.0f);	141 static_cast<float>(audio_delegate_->GetOutputVolumeLevel()) / 100.0f);

143 volume_view_->Update();	142 volume_view_->Update();

144 }	143 }

145 }	144 }

146	145

147 } // namespace ash	146 } // namespace ash

OLD	NEW