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 <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 #include <vector> | 10 #include <vector> |
11 | 11 |
12 #include "base/i18n/rtl.h" | 12 #include "base/i18n/rtl.h" |
13 #include "base/macros.h" | 13 #include "base/macros.h" |
14 #include "base/memory/ptr_util.h" | 14 #include "base/memory/ptr_util.h" |
15 #include "base/strings/string_util.h" | 15 #include "base/strings/string_util.h" |
16 #include "base/strings/utf_string_conversions.h" | 16 #include "base/strings/utf_string_conversions.h" |
17 #include "chrome/browser/certificate_viewer.h" | 17 #include "chrome/browser/certificate_viewer.h" |
18 #include "chrome/browser/devtools/devtools_toggle_action.h" | 18 #include "chrome/browser/devtools/devtools_toggle_action.h" |
19 #include "chrome/browser/devtools/devtools_window.h" | 19 #include "chrome/browser/devtools/devtools_window.h" |
20 #include "chrome/browser/infobars/infobar_service.h" | 20 #include "chrome/browser/infobars/infobar_service.h" |
21 #include "chrome/browser/profiles/profile.h" | 21 #include "chrome/browser/profiles/profile.h" |
22 #include "chrome/browser/ui/browser.h" | 22 #include "chrome/browser/ui/browser.h" |
23 #include "chrome/browser/ui/browser_dialogs.h" | 23 #include "chrome/browser/ui/browser_dialogs.h" |
24 #include "chrome/browser/ui/layout_constants.h" | 24 #include "chrome/browser/ui/layout_constants.h" |
25 #include "chrome/browser/ui/views/collected_cookies_views.h" | 25 #include "chrome/browser/ui/views/collected_cookies_views.h" |
26 #include "chrome/browser/ui/views/website_settings/chosen_object_view.h" | 26 #include "chrome/browser/ui/views/website_settings/chosen_object_row.h" |
27 #include "chrome/browser/ui/views/website_settings/permission_selector_view.h" | 27 #include "chrome/browser/ui/views/website_settings/permission_selector_row.h" |
28 #include "chrome/browser/ui/website_settings/website_settings.h" | 28 #include "chrome/browser/ui/website_settings/website_settings.h" |
29 #include "chrome/common/pref_names.h" | 29 #include "chrome/common/pref_names.h" |
30 #include "chrome/common/url_constants.h" | 30 #include "chrome/common/url_constants.h" |
31 #include "chrome/grit/chromium_strings.h" | 31 #include "chrome/grit/chromium_strings.h" |
32 #include "chrome/grit/generated_resources.h" | 32 #include "chrome/grit/generated_resources.h" |
33 #include "chrome/grit/theme_resources.h" | 33 #include "chrome/grit/theme_resources.h" |
34 #include "components/content_settings/core/common/content_settings_types.h" | 34 #include "components/content_settings/core/common/content_settings_types.h" |
35 #include "components/prefs/pref_service.h" | 35 #include "components/prefs/pref_service.h" |
36 #include "components/strings/grit/components_chromium_strings.h" | 36 #include "components/strings/grit/components_chromium_strings.h" |
37 #include "components/strings/grit/components_strings.h" | 37 #include "components/strings/grit/components_strings.h" |
(...skipping 592 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
630 } | 630 } |
631 | 631 |
632 layout->Layout(site_data_content_); | 632 layout->Layout(site_data_content_); |
633 SizeToContents(); | 633 SizeToContents(); |
634 } | 634 } |
635 | 635 |
636 void WebsiteSettingsPopupView::SetPermissionInfo( | 636 void WebsiteSettingsPopupView::SetPermissionInfo( |
637 const PermissionInfoList& permission_info_list, | 637 const PermissionInfoList& permission_info_list, |
638 const ChosenObjectInfoList& chosen_object_info_list) { | 638 const ChosenObjectInfoList& chosen_object_info_list) { |
639 // When a permission is changed, WebsiteSettings::OnSitePermissionChanged() | 639 // When a permission is changed, WebsiteSettings::OnSitePermissionChanged() |
640 // calls this method with updated permissions. However, PermissionSelectorView | 640 // calls this method with updated permissions. However, PermissionSelectorRow |
641 // will have already updated its state, so it's already reflected in the UI. | 641 // will have already updated its state, so it's already reflected in the UI. |
642 // In addition, if a permission is set to the default setting, WebsiteSettings | 642 // In addition, if a permission is set to the default setting, WebsiteSettings |
643 // removes it from |permission_info_list|, but the button should remain. | 643 // removes it from |permission_info_list|, but the button should remain. |
644 if (permissions_content_) { | 644 if (permissions_content_) { |
645 base::STLDeleteContainerPointers(chosen_object_info_list.begin(), | 645 base::STLDeleteContainerPointers(chosen_object_info_list.begin(), |
646 chosen_object_info_list.end()); | 646 chosen_object_info_list.end()); |
647 return; | 647 return; |
648 } | 648 } |
649 | 649 |
650 permissions_content_ = new views::View(); | 650 permissions_content_ = new views::View(); |
(...skipping 12 matching lines...) Expand all Loading... |
663 const int content_column = 0; | 663 const int content_column = 0; |
664 views::ColumnSet* column_set = layout->AddColumnSet(content_column); | 664 views::ColumnSet* column_set = layout->AddColumnSet(content_column); |
665 column_set->AddColumn(views::GridLayout::FILL, | 665 column_set->AddColumn(views::GridLayout::FILL, |
666 views::GridLayout::FILL, | 666 views::GridLayout::FILL, |
667 1, | 667 1, |
668 views::GridLayout::USE_PREF, | 668 views::GridLayout::USE_PREF, |
669 0, | 669 0, |
670 0); | 670 0); |
671 for (const auto& permission : permission_info_list) { | 671 for (const auto& permission : permission_info_list) { |
672 layout->StartRow(1, content_column); | 672 layout->StartRow(1, content_column); |
673 PermissionSelectorView* selector = new PermissionSelectorView( | 673 PermissionSelectorRow* selector = new PermissionSelectorRow( |
674 web_contents() ? web_contents()->GetVisibleURL() : GURL::EmptyGURL(), | 674 web_contents() ? web_contents()->GetVisibleURL() : GURL::EmptyGURL(), |
675 permission); | 675 permission); |
676 selector->AddObserver(this); | 676 selector->AddObserver(this); |
677 layout->AddView(selector, | 677 layout->AddView(selector, |
678 1, | 678 1, |
679 1, | 679 1, |
680 views::GridLayout::LEADING, | 680 views::GridLayout::LEADING, |
681 views::GridLayout::CENTER); | 681 views::GridLayout::CENTER); |
682 layout->AddPaddingRow(1, kContentRowSpacing); | 682 layout->AddPaddingRow(1, kContentRowSpacing); |
683 } | 683 } |
684 | 684 |
685 for (auto* object : chosen_object_info_list) { | 685 for (auto* object : chosen_object_info_list) { |
686 layout->StartRow(1, content_column); | 686 layout->StartRow(1, content_column); |
687 // The view takes ownership of the object info. | 687 // The view takes ownership of the object info. |
688 auto* object_view = new ChosenObjectView(base::WrapUnique(object)); | 688 auto* object_view = new ChosenObjectRow(base::WrapUnique(object)); |
689 object_view->AddObserver(this); | 689 object_view->AddObserver(this); |
690 layout->AddView(object_view, 1, 1, views::GridLayout::LEADING, | 690 layout->AddView(object_view, 1, 1, views::GridLayout::LEADING, |
691 views::GridLayout::CENTER); | 691 views::GridLayout::CENTER); |
692 layout->AddPaddingRow(1, kContentRowSpacing); | 692 layout->AddPaddingRow(1, kContentRowSpacing); |
693 } | 693 } |
694 | 694 |
695 layout->Layout(permissions_content_); | 695 layout->Layout(permissions_content_); |
696 | 696 |
697 // Add site settings link. | 697 // Add site settings link. |
698 site_settings_link_ = new views::Link( | 698 site_settings_link_ = new views::Link( |
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
829 gfx::NativeWindow parent = | 829 gfx::NativeWindow parent = |
830 anchor_widget() ? anchor_widget()->GetNativeWindow() : nullptr; | 830 anchor_widget() ? anchor_widget()->GetNativeWindow() : nullptr; |
831 presenter_->RecordWebsiteSettingsAction( | 831 presenter_->RecordWebsiteSettingsAction( |
832 WebsiteSettings::WEBSITE_SETTINGS_CERTIFICATE_DIALOG_OPENED); | 832 WebsiteSettings::WEBSITE_SETTINGS_CERTIFICATE_DIALOG_OPENED); |
833 ShowCertificateViewerByID(web_contents(), parent, cert_id_); | 833 ShowCertificateViewerByID(web_contents(), parent, cert_id_); |
834 } else { | 834 } else { |
835 DevToolsWindow::OpenDevToolsWindow( | 835 DevToolsWindow::OpenDevToolsWindow( |
836 web_contents(), DevToolsToggleAction::ShowSecurityPanel()); | 836 web_contents(), DevToolsToggleAction::ShowSecurityPanel()); |
837 } | 837 } |
838 } | 838 } |
OLD | NEW |