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

Unified Diff: ash/common/system/tray/tray_notification_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
« no previous file with comments | « ash/common/system/tray/tray_item_view.cc ('k') | ash/common/system/tray/tray_popup_header_button.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/tray/tray_notification_view.cc
diff --git a/ash/common/system/tray/tray_notification_view.cc b/ash/common/system/tray/tray_notification_view.cc
index 2f2792eea3671d93f402313f57eb988282342615..2544f379e8a37012590f6fd6edfe4c89aa8a5e28 100644
--- a/ash/common/system/tray/tray_notification_view.cc
+++ b/ash/common/system/tray/tray_notification_view.cc
@@ -17,14 +17,9 @@
namespace ash {
TrayNotificationView::TrayNotificationView(SystemTrayItem* owner, int icon_id)
- : owner_(owner),
- icon_id_(icon_id),
- icon_(NULL),
- autoclose_delay_(0) {
-}
+ : owner_(owner), icon_id_(icon_id), icon_(NULL), autoclose_delay_(0) {}
-TrayNotificationView::~TrayNotificationView() {
-}
+TrayNotificationView::~TrayNotificationView() {}
void TrayNotificationView::InitView(views::View* contents) {
set_background(views::Background::CreateSolidBackground(kBackgroundColor));
@@ -33,9 +28,9 @@ void TrayNotificationView::InitView(views::View* contents) {
SetLayoutManager(layout);
views::ImageButton* close_button = new views::ImageButton(this);
- close_button->SetImage(views::CustomButton::STATE_NORMAL,
- ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
- IDR_MESSAGE_CLOSE));
+ close_button->SetImage(
+ views::CustomButton::STATE_NORMAL,
+ ResourceBundle::GetSharedInstance().GetImageSkiaNamed(IDR_MESSAGE_CLOSE));
close_button->SetImageAlignment(views::ImageButton::ALIGN_CENTER,
views::ImageButton::ALIGN_MIDDLE);
@@ -52,16 +47,15 @@ void TrayNotificationView::InitView(views::View* contents) {
// Icon
columns->AddColumn(views::GridLayout::CENTER, views::GridLayout::CENTER,
0, /* resize percent */
- views::GridLayout::FIXED,
- kNotificationIconWidth, kNotificationIconWidth);
+ views::GridLayout::FIXED, kNotificationIconWidth,
+ kNotificationIconWidth);
columns->AddPaddingColumn(0, kTrayPopupPaddingHorizontal / 2);
// Contents
columns->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL,
100, /* resize percent */
- views::GridLayout::FIXED,
- kTrayNotificationContentsWidth,
+ views::GridLayout::FIXED, kTrayNotificationContentsWidth,
kTrayNotificationContentsWidth);
columns->AddPaddingColumn(0, kTrayPopupPaddingHorizontal / 2);
@@ -69,8 +63,8 @@ void TrayNotificationView::InitView(views::View* contents) {
// Close button
columns->AddColumn(views::GridLayout::CENTER, views::GridLayout::LEADING,
0, /* resize percent */
- views::GridLayout::FIXED,
- kNotificationButtonWidth, kNotificationButtonWidth);
+ views::GridLayout::FIXED, kNotificationButtonWidth,
+ kNotificationButtonWidth);
// Layout rows
layout->AddPaddingRow(0, kTrayPopupPaddingBetweenItems);
@@ -108,8 +102,7 @@ void TrayNotificationView::StartAutoCloseTimer(int seconds) {
autoclose_.Stop();
autoclose_delay_ = seconds;
if (autoclose_delay_) {
- autoclose_.Start(FROM_HERE,
- base::TimeDelta::FromSeconds(autoclose_delay_),
+ autoclose_.Start(FROM_HERE, base::TimeDelta::FromSeconds(autoclose_delay_),
this, &TrayNotificationView::HandleClose);
}
}
@@ -143,11 +136,9 @@ void TrayNotificationView::OnGestureEvent(ui::GestureEvent* event) {
event->SetHandled();
}
-void TrayNotificationView::OnClose() {
-}
+void TrayNotificationView::OnClose() {}
-void TrayNotificationView::OnClickAction() {
-}
+void TrayNotificationView::OnClickAction() {}
void TrayNotificationView::OnSlideOut() {
owner_->HideNotificationView();
« no previous file with comments | « ash/common/system/tray/tray_item_view.cc ('k') | ash/common/system/tray/tray_popup_header_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698