ash/system/audio/audio_detailed_view.cc - Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1

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/system/audio/audio_detailed_view.cc

Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)

Patch Set: rebase Created 3 years, 9 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/system/audio/audio_detailed_view.h ('k') | ash/system/audio/tray_audio.h » ('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/audio_detailed_view.h"	5 #include "ash/system/audio/audio_detailed_view.h"

6	6

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

8 #include "ash/common/system/tray/tray_popup_utils.h"

9 #include "ash/common/system/tray/tri_view.h"

10 #include "ash/strings/grit/ash_strings.h"	7 #include "ash/strings/grit/ash_strings.h"

	8 #include "ash/system/tray/hover_highlight_view.h"

	9 #include "ash/system/tray/tray_popup_utils.h"

	10 #include "ash/system/tray/tri_view.h"

11 #include "base/strings/utf_string_conversions.h"	11 #include "base/strings/utf_string_conversions.h"

12 #include "chromeos/audio/cras_audio_handler.h"	12 #include "chromeos/audio/cras_audio_handler.h"

13 #include "ui/base/l10n/l10n_util.h"	13 #include "ui/base/l10n/l10n_util.h"

14 #include "ui/gfx/color_palette.h"	14 #include "ui/gfx/color_palette.h"

15 #include "ui/gfx/paint_vector_icon.h"	15 #include "ui/gfx/paint_vector_icon.h"

16 #include "ui/gfx/vector_icons_public.h"	16 #include "ui/gfx/vector_icons_public.h"

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

18 #include "ui/views/controls/image_view.h"	18 #include "ui/views/controls/image_view.h"

19 #include "ui/views/controls/label.h"	19 #include "ui/views/controls/label.h"

20 #include "ui/views/controls/scroll_view.h"	20 #include "ui/views/controls/scroll_view.h"

(...skipping 168 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
189 AudioDeviceMap::iterator iter = device_map_.find(view);	189 AudioDeviceMap::iterator iter = device_map_.find(view);

190 if (iter == device_map_.end())	190 if (iter == device_map_.end())

191 return;	191 return;

192 chromeos::AudioDevice device = iter->second;	192 chromeos::AudioDevice device = iter->second;

193 CrasAudioHandler::Get()->SwitchToDevice(device, true,	193 CrasAudioHandler::Get()->SwitchToDevice(device, true,

194 CrasAudioHandler::ACTIVATE_BY_USER);	194 CrasAudioHandler::ACTIVATE_BY_USER);

195 }	195 }

196	196

197 } // namespace tray	197 } // namespace tray

198 } // namespace ash	198 } // namespace ash

OLD	NEW