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

Unified Diff: ash/common/system/tray/hover_highlight_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/fixed_sized_scroll_view.cc ('k') | ash/common/system/tray/special_popup_row.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/tray/hover_highlight_view.cc
diff --git a/ash/common/system/tray/hover_highlight_view.cc b/ash/common/system/tray/hover_highlight_view.cc
index 5f4bf7708ee5fb242e340abf61fcb0d79e45894a..30cd5484c11ff038f32f1868d0f5be33c844f14b 100644
--- a/ash/common/system/tray/hover_highlight_view.cc
+++ b/ash/common/system/tray/hover_highlight_view.cc
@@ -47,8 +47,7 @@ HoverHighlightView::HoverHighlightView(ViewClickListener* listener)
set_notify_enter_exit_on_child(true);
}
-HoverHighlightView::~HoverHighlightView() {
-}
+HoverHighlightView::~HoverHighlightView() {}
bool HoverHighlightView::GetTooltipText(const gfx::Point& p,
base::string16* tooltip) const {
@@ -61,8 +60,8 @@ bool HoverHighlightView::GetTooltipText(const gfx::Point& p,
void HoverHighlightView::AddIconAndLabel(const gfx::ImageSkia& image,
const base::string16& text,
bool highlight) {
- SetLayoutManager(new views::BoxLayout(
- views::BoxLayout::kHorizontal, 0, 3, kTrayPopupPaddingBetweenItems));
+ SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 3,
+ kTrayPopupPaddingBetweenItems));
DoAddIconAndLabel(image, text, highlight);
}
@@ -134,9 +133,9 @@ views::Label* HoverHighlightView::AddCheckableLabel(const base::string16& text,
const gfx::ImageSkia* check =
rb.GetImageNamed(IDR_MENU_CHECK).ToImageSkia();
int margin = kTrayPopupPaddingHorizontal +
- kTrayPopupDetailsLabelExtraLeftMargin - kCheckLabelPadding;
- SetLayoutManager(new views::BoxLayout(
- views::BoxLayout::kHorizontal, 0, 3, kCheckLabelPadding));
+ kTrayPopupDetailsLabelExtraLeftMargin - kCheckLabelPadding;
+ SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 3,
+ kCheckLabelPadding));
views::ImageView* image_view = new FixedSizedImageView(margin, 0);
image_view->SetImage(check);
image_view->SetHorizontalAlignment(views::ImageView::TRAILING);
« no previous file with comments | « ash/common/system/tray/fixed_sized_scroll_view.cc ('k') | ash/common/system/tray/special_popup_row.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698