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

Unified Diff: ash/common/system/update/tray_update.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
« no previous file with comments | « ash/common/system/tray_accessibility.cc ('k') | ash/common/system/update/update_observer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/update/tray_update.cc
diff --git a/ash/common/system/update/tray_update.cc b/ash/common/system/update/tray_update.cc
index cdc4eb025981376aff542033c2e5d9a3e45ba2c4..51139ef07cb8a04d2dc5f5c43ee7174c72080d8e 100644
--- a/ash/common/system/update/tray_update.cc
+++ b/ash/common/system/update/tray_update.cc
@@ -23,20 +23,19 @@ namespace {
int DecideResource(ash::UpdateInfo::UpdateSeverity severity, bool dark) {
switch (severity) {
case ash::UpdateInfo::UPDATE_NORMAL:
- return dark ? IDR_AURA_UBER_TRAY_UPDATE_DARK:
- IDR_AURA_UBER_TRAY_UPDATE;
+ return dark ? IDR_AURA_UBER_TRAY_UPDATE_DARK : IDR_AURA_UBER_TRAY_UPDATE;
case ash::UpdateInfo::UPDATE_LOW_GREEN:
- return dark ? IDR_AURA_UBER_TRAY_UPDATE_DARK_GREEN :
- IDR_AURA_UBER_TRAY_UPDATE_GREEN;
+ return dark ? IDR_AURA_UBER_TRAY_UPDATE_DARK_GREEN
+ : IDR_AURA_UBER_TRAY_UPDATE_GREEN;
case ash::UpdateInfo::UPDATE_HIGH_ORANGE:
- return dark ? IDR_AURA_UBER_TRAY_UPDATE_DARK_ORANGE :
- IDR_AURA_UBER_TRAY_UPDATE_ORANGE;
+ return dark ? IDR_AURA_UBER_TRAY_UPDATE_DARK_ORANGE
+ : IDR_AURA_UBER_TRAY_UPDATE_ORANGE;
case ash::UpdateInfo::UPDATE_SEVERE_RED:
- return dark ? IDR_AURA_UBER_TRAY_UPDATE_DARK_RED :
- IDR_AURA_UBER_TRAY_UPDATE_RED;
+ return dark ? IDR_AURA_UBER_TRAY_UPDATE_DARK_RED
+ : IDR_AURA_UBER_TRAY_UPDATE_RED;
}
NOTREACHED() << "Unknown update severity level.";
@@ -46,10 +45,9 @@ int DecideResource(ash::UpdateInfo::UpdateSeverity severity, bool dark) {
class UpdateView : public ash::ActionableView {
public:
explicit UpdateView(const ash::UpdateInfo& info) {
- SetLayoutManager(new
- views::BoxLayout(views::BoxLayout::kHorizontal,
- ash::kTrayPopupPaddingHorizontal, 0,
- ash::kTrayPopupPaddingBetweenItems));
+ SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal,
+ ash::kTrayPopupPaddingHorizontal, 0,
+ ash::kTrayPopupPaddingBetweenItems));
ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
views::ImageView* image =
@@ -79,7 +77,6 @@ class UpdateView : public ash::ActionableView {
DISALLOW_COPY_AND_ASSIGN(UpdateView);
};
-
}
namespace ash {
« no previous file with comments | « ash/common/system/tray_accessibility.cc ('k') | ash/common/system/update/update_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698