chrome/browser/ui/views/website_settings/website_settings_popup_view.cc - Issue 15949029: Use a direct include of utf_string_conversions.h in chrome/browser/ui/, part 2.

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/website_settings/website_settings_popup_view.cc

Issue 15949029: Use a direct include of utf_string_conversions.h in chrome/browser/ui/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 6 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 | « chrome/browser/ui/views/website_settings/permission_selector_view.cc ('k') | chrome/browser/ui/views/wrench_menu.cc » ('j') | no next file with comments »

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 "chrome/browser/ui/views/website_settings/website_settings_popup_view.h "	5 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h "

6	6

7 #include "base/strings/string_number_conversions.h"	7 #include "base/strings/string_number_conversions.h"

8 #include "base/utf_string_conversions.h"	8 #include "base/strings/utf_string_conversions.h"

9 #include "chrome/browser/certificate_viewer.h"	9 #include "chrome/browser/certificate_viewer.h"

10 #include "chrome/browser/infobars/infobar_service.h"	10 #include "chrome/browser/infobars/infobar_service.h"

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

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

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

14 #include "chrome/browser/ui/views/website_settings/permission_selector_view.h"	14 #include "chrome/browser/ui/views/website_settings/permission_selector_view.h"

15 #include "chrome/browser/ui/website_settings/website_settings.h"	15 #include "chrome/browser/ui/website_settings/website_settings.h"

16 #include "chrome/browser/ui/website_settings/website_settings_utils.h"	16 #include "chrome/browser/ui/website_settings/website_settings_utils.h"

17 #include "chrome/common/content_settings_types.h"	17 #include "chrome/common/content_settings_types.h"

18 #include "chrome/common/url_constants.h"	18 #include "chrome/common/url_constants.h"

(...skipping 727 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
746	746

747 if (link) {	747 if (link) {

748 content_layout->StartRow(1, 0);	748 content_layout->StartRow(1, 0);

749 content_layout->AddView(link);	749 content_layout->AddView(link);

750 }	750 }

751	751

752 layout->AddView(content_pane, 1, 1, views::GridLayout::LEADING,	752 layout->AddView(content_pane, 1, 1, views::GridLayout::LEADING,

753 views::GridLayout::LEADING);	753 views::GridLayout::LEADING);

754 layout->AddPaddingRow(0, kConnectionSectionPaddingBottom);	754 layout->AddPaddingRow(0, kConnectionSectionPaddingBottom);

755 }	755 }

OLD	NEW