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

Unified Diff: ash/common/system/tray/tray_popup_item_container.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/tray/tray_popup_item_container.cc
diff --git a/ash/common/system/tray/tray_popup_item_container.cc b/ash/common/system/tray/tray_popup_item_container.cc
index c022523b69c2283c4b43314a114de44d229c34e5..3659ea6e6775c050a96376827854b982f82300bc 100644
--- a/ash/common/system/tray/tray_popup_item_container.cc
+++ b/ash/common/system/tray/tray_popup_item_container.cc
@@ -15,15 +15,14 @@ namespace ash {
TrayPopupItemContainer::TrayPopupItemContainer(views::View* view,
bool change_background,
bool draw_border)
- : active_(false),
- change_background_(change_background) {
+ : active_(false), change_background_(change_background) {
set_notify_enter_exit_on_child(true);
if (draw_border) {
SetBorder(
views::Border::CreateSolidSidedBorder(0, 0, 1, 0, kBorderLightColor));
}
- views::BoxLayout* layout = new views::BoxLayout(
- views::BoxLayout::kVertical, 0, 0, 0);
+ views::BoxLayout* layout =
+ new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0);
layout->SetDefaultFlex(1);
SetLayoutManager(layout);
if (view->layer()) {
@@ -34,8 +33,7 @@ TrayPopupItemContainer::TrayPopupItemContainer(views::View* view,
SetVisible(view->visible());
}
-TrayPopupItemContainer::~TrayPopupItemContainer() {
-}
+TrayPopupItemContainer::~TrayPopupItemContainer() {}
void TrayPopupItemContainer::SetActive(bool active) {
if (!change_background_ || active_ == active)
@@ -80,8 +78,8 @@ void TrayPopupItemContainer::OnPaintBackground(gfx::Canvas* canvas) {
views::View* view = child_at(0);
if (!view->background()) {
- canvas->FillRect(gfx::Rect(size()), (active_) ? kHoverBackgroundColor
- : kBackgroundColor);
+ canvas->FillRect(gfx::Rect(size()),
+ (active_) ? kHoverBackgroundColor : kBackgroundColor);
}
}
« no previous file with comments | « ash/common/system/tray/tray_popup_item_container.h ('k') | ash/common/system/tray/tray_popup_label_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698