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

Unified Diff: ash/system/chromeos/audio/audio_detailed_view.cc

Issue 2095193002: clang-format all of //ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 side-by-side diff with in-line comments
Download patch
Index: ash/system/chromeos/audio/audio_detailed_view.cc
diff --git a/ash/system/chromeos/audio/audio_detailed_view.cc b/ash/system/chromeos/audio/audio_detailed_view.cc
index 560b3e8790de2ad4bac9c94706d8df25a21aff98..89d80ed8b4db3cd5f7910d83fb726abd53f232fe 100644
--- a/ash/system/chromeos/audio/audio_detailed_view.cc
+++ b/ash/system/chromeos/audio/audio_detailed_view.cc
@@ -27,17 +27,15 @@ base::string16 GetAudioDeviceName(const chromeos::AudioDevice& device) {
case chromeos::AUDIO_TYPE_INTERNAL_MIC:
return l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_AUDIO_INTERNAL_MIC);
case chromeos::AUDIO_TYPE_USB:
- return l10n_util::GetStringFUTF16(
- IDS_ASH_STATUS_TRAY_AUDIO_USB_DEVICE,
- base::UTF8ToUTF16(device.display_name));
+ return l10n_util::GetStringFUTF16(IDS_ASH_STATUS_TRAY_AUDIO_USB_DEVICE,
+ base::UTF8ToUTF16(device.display_name));
case chromeos::AUDIO_TYPE_BLUETOOTH:
return l10n_util::GetStringFUTF16(
IDS_ASH_STATUS_TRAY_AUDIO_BLUETOOTH_DEVICE,
base::UTF8ToUTF16(device.display_name));
case chromeos::AUDIO_TYPE_HDMI:
- return l10n_util::GetStringFUTF16(
- IDS_ASH_STATUS_TRAY_AUDIO_HDMI_DEVICE,
- base::UTF8ToUTF16(device.display_name));
+ return l10n_util::GetStringFUTF16(IDS_ASH_STATUS_TRAY_AUDIO_HDMI_DEVICE,
+ base::UTF8ToUTF16(device.display_name));
case chromeos::AUDIO_TYPE_MIC:
return l10n_util::GetStringUTF16(
IDS_ASH_STATUS_TRAY_AUDIO_MIC_JACK_DEVICE);
@@ -59,8 +57,7 @@ AudioDetailedView::AudioDetailedView(SystemTrayItem* owner)
Update();
}
-AudioDetailedView::~AudioDetailedView() {
-}
+AudioDetailedView::~AudioDetailedView() {}
void AudioDetailedView::Update() {
UpdateAudioDevices();
@@ -69,13 +66,12 @@ void AudioDetailedView::Update() {
void AudioDetailedView::AddScrollListInfoItem(const base::string16& text) {
views::Label* label = new views::Label(
- text,
- ui::ResourceBundle::GetSharedInstance().GetFontList(
- ui::ResourceBundle::BoldFont));
+ text, ui::ResourceBundle::GetSharedInstance().GetFontList(
+ ui::ResourceBundle::BoldFont));
// Align info item with checkbox items
- int margin = kTrayPopupPaddingHorizontal +
- kTrayPopupDetailsLabelExtraLeftMargin;
+ int margin =
+ kTrayPopupPaddingHorizontal + kTrayPopupDetailsLabelExtraLeftMargin;
int left_margin = 0;
int right_margin = 0;
if (base::i18n::IsRTL())
@@ -84,10 +80,8 @@ void AudioDetailedView::AddScrollListInfoItem(const base::string16& text) {
left_margin = margin;
label->SetBorder(views::Border::CreateEmptyBorder(
- ash::kTrayPopupPaddingBetweenItems,
- left_margin,
- ash::kTrayPopupPaddingBetweenItems,
- right_margin));
+ ash::kTrayPopupPaddingBetweenItems, left_margin,
+ ash::kTrayPopupPaddingBetweenItems, right_margin));
label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
label->SetEnabledColor(SkColorSetARGB(192, 0, 0, 0));
« no previous file with comments | « ash/system/chromeos/audio/audio_detailed_view.h ('k') | ash/system/chromeos/audio/tray_audio_delegate_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698