chrome/browser/ui/views/website_settings/website_settings_popup_view.cc - Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 …

Side by Side Diff: chrome/browser/ui/views/website_settings/website_settings_popup_view.cc

Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 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

« no previous file with comments | « chrome/browser/ui/views/website_settings/permissions_bubble_view.cc ('k') | chrome/browser/ui/website_settings/permission_menu_model.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 <algorithm>	7 #include <algorithm>

8	8

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

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

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

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

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

14 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate.h"	14 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate.h"

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

16 #include "chrome/browser/ui/browser_dialogs.h"	16 #include "chrome/browser/ui/browser_dialogs.h"

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

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

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

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

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

	22 #include "chrome/grit/chromium_strings.h"

	23 #include "chrome/grit/generated_resources.h"

22 #include "components/content_settings/core/common/content_settings_types.h"	24 #include "components/content_settings/core/common/content_settings_types.h"

23 #include "content/public/browser/browser_thread.h"	25 #include "content/public/browser/browser_thread.h"

24 #include "content/public/browser/cert_store.h"	26 #include "content/public/browser/cert_store.h"

25 #include "content/public/browser/user_metrics.h"	27 #include "content/public/browser/user_metrics.h"

26 #include "grit/chromium_strings.h"

27 #include "grit/generated_resources.h"

28 #include "grit/theme_resources.h"	28 #include "grit/theme_resources.h"

29 #include "ui/base/l10n/l10n_util.h"	29 #include "ui/base/l10n/l10n_util.h"

30 #include "ui/base/models/simple_menu_model.h"	30 #include "ui/base/models/simple_menu_model.h"

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

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

33 #include "ui/gfx/font_list.h"	33 #include "ui/gfx/font_list.h"

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

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

36 #include "ui/resources/grit/ui_resources.h"	36 #include "ui/resources/grit/ui_resources.h"

37 #include "ui/views/controls/button/image_button.h"	37 #include "ui/views/controls/button/image_button.h"

(...skipping 774 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
812	812

813 if (reset_decisions_button) {	813 if (reset_decisions_button) {

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

815 content_layout->AddView(reset_decisions_button);	815 content_layout->AddView(reset_decisions_button);

816 }	816 }

817	817

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

819 views::GridLayout::LEADING);	819 views::GridLayout::LEADING);

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

821 }	821 }

OLD	NEW