chrome/browser/ui/views/frame/browser_header_painter_ash.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: chrome/browser/ui/views/frame/browser_header_painter_ash.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

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 "chrome/browser/ui/views/frame/browser_header_painter_ash.h"	5 #include "chrome/browser/ui/views/frame/browser_header_painter_ash.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/vector_icons/vector_icons.h"	10 #include "ash/resources/vector_icons/vector_icons.h"

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

12 #include "chrome/browser/themes/theme_properties.h"	12 #include "chrome/browser/themes/theme_properties.h"

13 #include "chrome/browser/ui/browser.h"	13 #include "chrome/browser/ui/browser.h"

14 #include "chrome/browser/ui/views/frame/browser_frame.h"	14 #include "chrome/browser/ui/views/frame/browser_frame.h"

15 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h"	15 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h"

16 #include "chrome/browser/ui/views/frame/browser_view.h"	16 #include "chrome/browser/ui/views/frame/browser_view.h"

17 #include "third_party/skia/include/core/SkCanvas.h"	17 #include "third_party/skia/include/core/SkCanvas.h"

(...skipping 292 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
310 }	310 }

311	311

312 gfx::Rect BrowserHeaderPainterAsh::GetPaintedBounds() const {	312 gfx::Rect BrowserHeaderPainterAsh::GetPaintedBounds() const {

313 return gfx::Rect(view_->width(), painted_height_);	313 return gfx::Rect(view_->width(), painted_height_);

314 }	314 }

315	315

316 gfx::Rect BrowserHeaderPainterAsh::GetTitleBounds() const {	316 gfx::Rect BrowserHeaderPainterAsh::GetTitleBounds() const {

317 return ash::HeaderPainterUtil::GetTitleBounds(window_icon_,	317 return ash::HeaderPainterUtil::GetTitleBounds(window_icon_,

318 caption_button_container_, BrowserFrame::GetTitleFontList());	318 caption_button_container_, BrowserFrame::GetTitleFontList());

319 }	319 }

OLD	NEW