ash/wm/custom_frame_view_ash.cc - Issue 23498031: Move code related to the window controls to ash/wm/caption_buttons

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/wm/custom_frame_view_ash.cc

Issue 23498031: Move code related to the window controls to ash/wm/caption_buttons (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased Created 7 years, 3 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 | Annotate | Revision Log

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/wm/custom_frame_view_ash.h"	5 #include "ash/wm/custom_frame_view_ash.h"

6	6

	7 #include "ash/wm/caption_buttons/frame_caption_button_container_view.h"

7 #include "ash/wm/frame_painter.h"	8 #include "ash/wm/frame_painter.h"

8 #include "ash/wm/workspace/frame_caption_button_container_view.h"

9 #include "grit/ash_resources.h"	9 #include "grit/ash_resources.h"

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

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

12 #include "ui/gfx/font.h"	12 #include "ui/gfx/font.h"

13 #include "ui/gfx/image/image.h"	13 #include "ui/gfx/image/image.h"

14 #include "ui/gfx/rect.h"	14 #include "ui/gfx/rect.h"

15 #include "ui/gfx/size.h"	15 #include "ui/gfx/size.h"

16 #include "ui/views/widget/native_widget_aura.h"	16 #include "ui/views/widget/native_widget_aura.h"

17 #include "ui/views/widget/widget.h"	17 #include "ui/views/widget/widget.h"

18 #include "ui/views/widget/widget_delegate.h"	18 #include "ui/views/widget/widget_delegate.h"

(...skipping 139 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
158 if (frame_->IsFullscreen())	158 if (frame_->IsFullscreen())

159 return 0;	159 return 0;

160	160

161 // Reserve enough space to see the buttons, including any offset from top and	161 // Reserve enough space to see the buttons, including any offset from top and

162 // reserving space for the separator line.	162 // reserving space for the separator line.

163 return caption_button_container_->bounds().bottom() +	163 return caption_button_container_->bounds().bottom() +

164 frame_painter_->HeaderContentSeparatorSize();	164 frame_painter_->HeaderContentSeparatorSize();

165 }	165 }

166	166

167 } // namespace ash	167 } // namespace ash

OLD	NEW

« no previous file with comments | « ash/wm/caption_buttons/maximize_bubble_frame_state.h ('k') | ash/wm/custom_frame_view_ash_unittest.cc » ('j') | no next file with comments »