ash/frame/default_header_painter.cc - Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3"

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ash/frame/default_header_painter.cc

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)

Patch Set: Created 3 years, 9 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 unified diff | Download patch

« no previous file with comments | « ash/frame/custom_frame_view_ash_unittest.cc ('k') | ash/frame/frame_border_hit_test.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "ash/frame/default_header_painter.h"	5 #include "ash/frame/default_header_painter.h"

6	6

7 #include "ash/ash_layout_constants.h"	7 #include "ash/common/ash_layout_constants.h"

8 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"	8 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"

9 #include "ash/frame/header_painter_util.h"	9 #include "ash/frame/header_painter_util.h"

10 #include "ash/resources/grit/ash_resources.h"	10 #include "ash/resources/grit/ash_resources.h"

11 #include "ash/resources/vector_icons/vector_icons.h"	11 #include "ash/resources/vector_icons/vector_icons.h"

12 #include "base/debug/leak_annotations.h"	12 #include "base/debug/leak_annotations.h"

13 #include "base/logging.h" // DCHECK	13 #include "base/logging.h" // DCHECK

14 #include "third_party/skia/include/core/SkPath.h"	14 #include "third_party/skia/include/core/SkPath.h"

15 #include "ui/base/resource/resource_bundle.h"	15 #include "ui/base/resource/resource_bundle.h"

16 #include "ui/gfx/animation/slide_animation.h"	16 #include "ui/gfx/animation/slide_animation.h"

17 #include "ui/gfx/canvas.h"	17 #include "ui/gfx/canvas.h"

(...skipping 295 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
313 return HeaderPainterUtil::GetTitleBounds(	313 return HeaderPainterUtil::GetTitleBounds(

314 left_header_view_, caption_button_container_, GetTitleFontList());	314 left_header_view_, caption_button_container_, GetTitleFontList());

315 }	315 }

316	316

317 bool DefaultHeaderPainter::UsesCustomFrameColors() const {	317 bool DefaultHeaderPainter::UsesCustomFrameColors() const {

318 return active_frame_color_ != kDefaultFrameColor \|\|	318 return active_frame_color_ != kDefaultFrameColor \|\|

319 inactive_frame_color_ != kDefaultFrameColor;	319 inactive_frame_color_ != kDefaultFrameColor;

320 }	320 }

321	321

322 } // namespace ash	322 } // namespace ash

OLD	NEW