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

Unified Diff: ash/wm/panels/panel_frame_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/wm/panels/panel_frame_view.h ('k') | ash/wm/panels/panel_layout_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/panels/panel_frame_view.cc
diff --git a/ash/wm/panels/panel_frame_view.cc b/ash/wm/panels/panel_frame_view.cc
index bda221efd283660274e38335bc2d4a68bc034cd2..85846f490c70c82d5590915358ed587dc2da0f1f 100644
--- a/ash/wm/panels/panel_frame_view.cc
+++ b/ash/wm/panels/panel_frame_view.cc
@@ -31,8 +31,7 @@ PanelFrameView::PanelFrameView(views::Widget* frame, FrameType frame_type)
InitHeaderPainter();
}
-PanelFrameView::~PanelFrameView() {
-}
+PanelFrameView::~PanelFrameView() {}
void PanelFrameView::SetFrameColors(SkColor active_frame_color,
SkColor inactive_frame_color) {
@@ -68,10 +67,9 @@ gfx::Size PanelFrameView::GetMinimumSize() const {
if (!header_painter_)
return gfx::Size();
gfx::Size min_client_view_size(frame_->client_view()->GetMinimumSize());
- return gfx::Size(
- std::max(header_painter_->GetMinimumHeaderWidth(),
- min_client_view_size.width()),
- NonClientTopBorderHeight() + min_client_view_size.height());
+ return gfx::Size(std::max(header_painter_->GetMinimumHeaderWidth(),
+ min_client_view_size.width()),
+ NonClientTopBorderHeight() + min_client_view_size.height());
}
void PanelFrameView::Layout() {
@@ -105,14 +103,13 @@ void PanelFrameView::UpdateWindowTitle() {
header_painter_->SchedulePaintForTitle();
}
-void PanelFrameView::SizeConstraintsChanged() {
-}
+void PanelFrameView::SizeConstraintsChanged() {}
int PanelFrameView::NonClientHitTest(const gfx::Point& point) {
if (!header_painter_)
return HTNOWHERE;
- return FrameBorderHitTestController::NonClientHitTest(this,
- caption_button_container_, point);
+ return FrameBorderHitTestController::NonClientHitTest(
+ this, caption_button_container_, point);
}
void PanelFrameView::OnPaint(gfx::Canvas* canvas) {
@@ -121,8 +118,9 @@ void PanelFrameView::OnPaint(gfx::Canvas* canvas) {
bool paint_as_active = ShouldPaintAsActive();
caption_button_container_->SetPaintAsActive(paint_as_active);
- HeaderPainter::Mode header_mode = paint_as_active ?
- HeaderPainter::MODE_ACTIVE : HeaderPainter::MODE_INACTIVE;
+ HeaderPainter::Mode header_mode = paint_as_active
+ ? HeaderPainter::MODE_ACTIVE
+ : HeaderPainter::MODE_INACTIVE;
header_painter_->PaintHeader(canvas, header_mode);
}
« no previous file with comments | « ash/wm/panels/panel_frame_view.h ('k') | ash/wm/panels/panel_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698