ash/common/system/chromeos/audio/tray_audio.cc - Issue 2620153003: Folds WmRootWindowController into RootWindowController

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2620153003: Folds WmRootWindowController into RootWindowController (Closed)

Patch Set: merge Created 3 years, 11 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/shelf/wm_shelf.cc ('k') | ash/common/system/chromeos/ime_menu/ime_menu_tray.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/common/system/chromeos/audio/tray_audio.h"	5 #include "ash/common/system/chromeos/audio/tray_audio.h"

6	6

7 #include "ash/common/system/chromeos/audio/audio_detailed_view.h"	7 #include "ash/common/system/chromeos/audio/audio_detailed_view.h"

8 #include "ash/common/system/chromeos/audio/tray_audio_delegate_chromeos.h"	8 #include "ash/common/system/chromeos/audio/tray_audio_delegate_chromeos.h"

9 #include "ash/common/system/chromeos/audio/volume_view.h"	9 #include "ash/common/system/chromeos/audio/volume_view.h"

10 #include "ash/common/system/tray/system_tray.h"	10 #include "ash/common/system/tray/system_tray.h"

11 #include "ash/common/system/tray/tray_constants.h"	11 #include "ash/common/system/tray/tray_constants.h"

12 #include "ash/common/wm_root_window_controller.h"

13 #include "ash/common/wm_shell.h"	12 #include "ash/common/wm_shell.h"

14 #include "ash/common/wm_window.h"	13 #include "ash/common/wm_window.h"

	14 #include "ash/root_window_controller.h"

15 #include "chromeos/dbus/dbus_thread_manager.h"	15 #include "chromeos/dbus/dbus_thread_manager.h"

16 #include "grit/ash_resources.h"	16 #include "grit/ash_resources.h"

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

18 #include "ui/display/manager/managed_display_info.h"	18 #include "ui/display/manager/managed_display_info.h"

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

20 #include "ui/views/view.h"	20 #include "ui/views/view.h"

21	21

22 namespace ash {	22 namespace ash {

23	23

24 using chromeos::CrasAudioHandler;	24 using chromeos::CrasAudioHandler;

(...skipping 176 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
201 volume_view_->SetVolumeLevel(	201 volume_view_->SetVolumeLevel(

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

203 volume_view_->Update();	203 volume_view_->Update();

204 }	204 }

205	205

206 if (audio_detail_view_)	206 if (audio_detail_view_)

207 audio_detail_view_->Update();	207 audio_detail_view_->Update();

208 }	208 }

209	209

210 } // namespace ash	210 } // namespace ash

OLD	NEW