views/layout/box_layout.cc - Issue 6312156: Change includes of gfx/* to ui/gfx/*

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: views/layout/box_layout.cc

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 10 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

« no previous file with comments | « views/focus/focus_manager_unittest.cc ('k') | views/layout/grid_layout.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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 "views/layout/box_layout.h"	5 #include "views/layout/box_layout.h"

6	6

7 #include "gfx/insets.h"	7 #include "ui/gfx/insets.h"

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

9 #include "views/view.h"	9 #include "views/view.h"

10	10

11 namespace views {	11 namespace views {

12	12

13 BoxLayout::BoxLayout(BoxLayout::Orientation orientation,	13 BoxLayout::BoxLayout(BoxLayout::Orientation orientation,

14 int inside_border_horizontal_spacing,	14 int inside_border_horizontal_spacing,

15 int inside_border_vertical_spacing,	15 int inside_border_vertical_spacing,

16 int between_child_spacing)	16 int between_child_spacing)

17 : orientation_(orientation),	17 : orientation_(orientation),

18 inside_border_horizontal_spacing_(inside_border_horizontal_spacing),	18 inside_border_horizontal_spacing_(inside_border_horizontal_spacing),

(...skipping 48 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
67 position += between_child_spacing_;	67 position += between_child_spacing_;

68 }	68 }

69 }	69 }

70 gfx::Insets insets(host->GetInsets());	70 gfx::Insets insets(host->GetInsets());

71 return gfx::Size(	71 return gfx::Size(

72 bounds.width() + insets.width() + 2 * inside_border_horizontal_spacing_,	72 bounds.width() + insets.width() + 2 * inside_border_horizontal_spacing_,

73 bounds.height() + insets.height() + 2 * inside_border_vertical_spacing_);	73 bounds.height() + insets.height() + 2 * inside_border_vertical_spacing_);

74 }	74 }

75	75

76 } // namespace views	76 } // namespace views

OLD	NEW