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

Unified Diff: ash/common/system/chromeos/settings/tray_settings.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/common/system/chromeos/settings/tray_settings.cc
diff --git a/ash/common/system/chromeos/settings/tray_settings.cc b/ash/common/system/chromeos/settings/tray_settings.cc
index 33cf7118134510720750b750ffa654c407a7723e..9df583bfa93c554a33a4cd5066e1b947d5b4fb14 100644
--- a/ash/common/system/chromeos/settings/tray_settings.cc
+++ b/ash/common/system/chromeos/settings/tray_settings.cc
@@ -35,8 +35,8 @@ class SettingsDefaultView : public ActionableView,
: login_status_(status), label_(NULL), power_status_view_(NULL) {
PowerStatus::Get()->AddObserver(this);
SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal,
- ash::kTrayPopupPaddingHorizontal, 0,
- ash::kTrayPopupPaddingBetweenItems));
+ ash::kTrayPopupPaddingHorizontal, 0,
+ ash::kTrayPopupPaddingBetweenItems));
bool power_view_right_align = false;
if (login_status_ != LoginStatus::NOT_LOGGED_IN &&
@@ -107,10 +107,11 @@ class SettingsDefaultView : public ActionableView,
if (!PowerStatus::Get()->IsBatteryPresent())
return;
- base::string16 accessible_name = label_ ?
- label_->text() + base::ASCIIToUTF16(", ") +
- PowerStatus::Get()->GetAccessibleNameString(true) :
- PowerStatus::Get()->GetAccessibleNameString(true);
+ base::string16 accessible_name =
+ label_
+ ? label_->text() + base::ASCIIToUTF16(", ") +
+ PowerStatus::Get()->GetAccessibleNameString(true)
+ : PowerStatus::Get()->GetAccessibleNameString(true);
SetAccessibleName(accessible_name);
}
@@ -120,17 +121,14 @@ class SettingsDefaultView : public ActionableView,
ash::PowerStatusView* power_status_view_;
DISALLOW_COPY_AND_ASSIGN(SettingsDefaultView);
- };
+};
} // namespace tray
TraySettings::TraySettings(SystemTray* system_tray)
- : SystemTrayItem(system_tray),
- default_view_(NULL) {
-}
+ : SystemTrayItem(system_tray), default_view_(NULL) {}
-TraySettings::~TraySettings() {
-}
+TraySettings::~TraySettings() {}
views::View* TraySettings::CreateTrayView(LoginStatus status) {
return NULL;
@@ -143,7 +141,7 @@ views::View* TraySettings::CreateDefaultView(LoginStatus status) {
if (!WmShell::Get()->system_tray_delegate()->ShouldShowSettings())
return NULL;
CHECK(default_view_ == NULL);
- default_view_ = new tray::SettingsDefaultView(status);
+ default_view_ = new tray::SettingsDefaultView(status);
return default_view_;
}
« no previous file with comments | « ash/common/system/chromeos/power/tray_power_unittest.cc ('k') | ash/common/system/chromeos/system_clock_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698