chrome/browser/ui/views/options/advanced_page_view.cc - Issue 6204002: Carnitas: Remove chrome/browser/views, update references.

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/options/advanced_page_view.cc

Issue 6204002: Carnitas: Remove chrome/browser/views, update references. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Yay, more syncing Created 9 years, 11 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) 2010 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 "chrome/browser/views/options/advanced_page_view.h"	5 #include "chrome/browser/ui/views/options/advanced_page_view.h"

6	6

7 #include "app/l10n_util.h"	7 #include "app/l10n_util.h"

8 #include "app/message_box_flags.h"	8 #include "app/message_box_flags.h"

9 #include "base/string_util.h"	9 #include "base/string_util.h"

10 #include "base/utf_string_conversions.h"	10 #include "base/utf_string_conversions.h"

11 #include "chrome/browser/profiles/profile.h"	11 #include "chrome/browser/profiles/profile.h"

12 #include "chrome/browser/ui/options/options_util.h"	12 #include "chrome/browser/ui/options/options_util.h"

13 #include "chrome/browser/ui/views/options/advanced_contents_view.h"	13 #include "chrome/browser/ui/views/options/advanced_contents_view.h"

14 #include "chrome/browser/ui/views/options/managed_prefs_banner_view.h"	14 #include "chrome/browser/ui/views/options/managed_prefs_banner_view.h"

15 #include "chrome/common/chrome_constants.h"	15 #include "chrome/common/chrome_constants.h"

(...skipping 124 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
140 new ManagedPrefsBannerView(profile()->GetPrefs(), OPTIONS_PAGE_ADVANCED));	140 new ManagedPrefsBannerView(profile()->GetPrefs(), OPTIONS_PAGE_ADVANCED));

141	141

142 layout->StartRow(1, single_column_view_set_id);	142 layout->StartRow(1, single_column_view_set_id);

143 layout->AddView(advanced_scroll_view_);	143 layout->AddView(advanced_scroll_view_);

144 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);	144 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);

145	145

146 layout->StartRow(0, single_column_view_set_id);	146 layout->StartRow(0, single_column_view_set_id);

147 layout->AddView(reset_to_default_button_, 1, 1,	147 layout->AddView(reset_to_default_button_, 1, 1,

148 GridLayout::TRAILING, GridLayout::CENTER);	148 GridLayout::TRAILING, GridLayout::CENTER);

149 }	149 }

OLD	NEW