ash/common/system/audio/tray_audio.cc - Issue 2098023002: mash: Migrate remaining tray observers and notify functions.

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

Issue 2098023002: mash: Migrate remaining tray observers and notify functions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Sync and rebase. Created 4 years, 6 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/common/keyboard/keyboard_ui.cc ('k') | ash/common/system/chromeos/bluetooth/bluetooth_observer.h » ('j') | ash/shell.h » ('J')

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/tray_audio.h"	5 #include "ash/common/system/audio/tray_audio.h"

6	6

7 #include <cmath>	7 #include <cmath>

8 #include <utility>	8 #include <utility>

9	9

10 #include "ash/common/ash_constants.h"	10 #include "ash/common/ash_constants.h"

11 #include "ash/common/display/display_info.h"	11 #include "ash/common/display/display_info.h"

12 #include "ash/common/system/audio/tray_audio_delegate.h"	12 #include "ash/common/system/audio/tray_audio_delegate.h"

13 #include "ash/common/system/audio/volume_view.h"	13 #include "ash/common/system/audio/volume_view.h"

14 #include "ash/common/system/tray/actionable_view.h"	14 #include "ash/common/system/tray/actionable_view.h"

15 #include "ash/common/system/tray/fixed_sized_scroll_view.h"	15 #include "ash/common/system/tray/fixed_sized_scroll_view.h"

16 #include "ash/common/system/tray/hover_highlight_view.h"	16 #include "ash/common/system/tray/hover_highlight_view.h"

17 #include "ash/common/system/tray/system_tray_delegate.h"	17 #include "ash/common/system/tray/system_tray_delegate.h"

	18 #include "ash/common/system/tray/system_tray_notifier.h"

18 #include "ash/common/system/tray/tray_constants.h"	19 #include "ash/common/system/tray/tray_constants.h"

19 #include "ash/common/system/tray/wm_system_tray_notifier.h"

20 #include "ash/common/system/volume_control_delegate.h"	20 #include "ash/common/system/volume_control_delegate.h"

21 #include "ash/common/wm_shell.h"	21 #include "ash/common/wm_shell.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 "third_party/skia/include/core/SkCanvas.h"	24 #include "third_party/skia/include/core/SkCanvas.h"

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

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

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

28 #include "ui/display/display.h"	28 #include "ui/display/display.h"

29 #include "ui/display/screen.h"	29 #include "ui/display/screen.h"

(...skipping 147 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
177 if (tray_view())	177 if (tray_view())

178 tray_view()->SetVisible(GetInitialVisibility());	178 tray_view()->SetVisible(GetInitialVisibility());

179 if (volume_view_) {	179 if (volume_view_) {

180 volume_view_->SetVolumeLevel(	180 volume_view_->SetVolumeLevel(

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

182 volume_view_->Update();	182 volume_view_->Update();

183 }	183 }

184 }	184 }

185	185

186 } // namespace ash	186 } // namespace ash

OLD	NEW