Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(831)

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

Issue 2272793007: Material Page Info (Views, 1/3): Rename {ChosenObject, PermissionSelector}View classes to {...}Row. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
OLDNEW
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 "components/content_settings/core/common/content_settings_types.h" 33 #include "components/content_settings/core/common/content_settings_types.h"
34 #include "components/prefs/pref_service.h" 34 #include "components/prefs/pref_service.h"
35 #include "content/public/browser/browser_thread.h" 35 #include "content/public/browser/browser_thread.h"
36 #include "content/public/browser/cert_store.h" 36 #include "content/public/browser/cert_store.h"
37 #include "content/public/browser/user_metrics.h" 37 #include "content/public/browser/user_metrics.h"
(...skipping 590 matching lines...) Expand 10 before | Expand all | Expand 10 after
628 } 628 }
629 629
630 layout->Layout(site_data_content_); 630 layout->Layout(site_data_content_);
631 SizeToContents(); 631 SizeToContents();
632 } 632 }
633 633
634 void WebsiteSettingsPopupView::SetPermissionInfo( 634 void WebsiteSettingsPopupView::SetPermissionInfo(
635 const PermissionInfoList& permission_info_list, 635 const PermissionInfoList& permission_info_list,
636 const ChosenObjectInfoList& chosen_object_info_list) { 636 const ChosenObjectInfoList& chosen_object_info_list) {
637 // When a permission is changed, WebsiteSettings::OnSitePermissionChanged() 637 // When a permission is changed, WebsiteSettings::OnSitePermissionChanged()
638 // calls this method with updated permissions. However, PermissionSelectorView 638 // calls this method with updated permissions. However, PermissionSelectorRow
639 // will have already updated its state, so it's already reflected in the UI. 639 // will have already updated its state, so it's already reflected in the UI.
640 // In addition, if a permission is set to the default setting, WebsiteSettings 640 // In addition, if a permission is set to the default setting, WebsiteSettings
641 // removes it from |permission_info_list|, but the button should remain. 641 // removes it from |permission_info_list|, but the button should remain.
642 if (permissions_content_) { 642 if (permissions_content_) {
643 base::STLDeleteContainerPointers(chosen_object_info_list.begin(), 643 base::STLDeleteContainerPointers(chosen_object_info_list.begin(),
644 chosen_object_info_list.end()); 644 chosen_object_info_list.end());
645 return; 645 return;
646 } 646 }
647 647
648 permissions_content_ = new views::View(); 648 permissions_content_ = new views::View();
(...skipping 12 matching lines...) Expand all
661 const int content_column = 0; 661 const int content_column = 0;
662 views::ColumnSet* column_set = layout->AddColumnSet(content_column); 662 views::ColumnSet* column_set = layout->AddColumnSet(content_column);
663 column_set->AddColumn(views::GridLayout::FILL, 663 column_set->AddColumn(views::GridLayout::FILL,
664 views::GridLayout::FILL, 664 views::GridLayout::FILL,
665 1, 665 1,
666 views::GridLayout::USE_PREF, 666 views::GridLayout::USE_PREF,
667 0, 667 0,
668 0); 668 0);
669 for (const auto& permission : permission_info_list) { 669 for (const auto& permission : permission_info_list) {
670 layout->StartRow(1, content_column); 670 layout->StartRow(1, content_column);
671 PermissionSelectorView* selector = new PermissionSelectorView( 671 PermissionSelectorRow* selector = new PermissionSelectorRow(
672 web_contents_ ? web_contents_->GetURL() : GURL::EmptyGURL(), 672 web_contents_ ? web_contents_->GetURL() : GURL::EmptyGURL(),
673 permission); 673 permission);
674 selector->AddObserver(this); 674 selector->AddObserver(this);
675 layout->AddView(selector, 675 layout->AddView(selector,
676 1, 676 1,
677 1, 677 1,
678 views::GridLayout::LEADING, 678 views::GridLayout::LEADING,
679 views::GridLayout::CENTER); 679 views::GridLayout::CENTER);
680 layout->AddPaddingRow(1, kContentRowSpacing); 680 layout->AddPaddingRow(1, kContentRowSpacing);
681 } 681 }
682 682
683 for (auto* object : chosen_object_info_list) { 683 for (auto* object : chosen_object_info_list) {
684 layout->StartRow(1, content_column); 684 layout->StartRow(1, content_column);
685 // The view takes ownership of the object info. 685 // The view takes ownership of the object info.
686 auto* object_view = new ChosenObjectView(base::WrapUnique(object)); 686 auto* object_view = new ChosenObjectRow(base::WrapUnique(object));
687 object_view->AddObserver(this); 687 object_view->AddObserver(this);
688 layout->AddView(object_view, 1, 1, views::GridLayout::LEADING, 688 layout->AddView(object_view, 1, 1, views::GridLayout::LEADING,
689 views::GridLayout::CENTER); 689 views::GridLayout::CENTER);
690 layout->AddPaddingRow(1, kContentRowSpacing); 690 layout->AddPaddingRow(1, kContentRowSpacing);
691 } 691 }
692 692
693 layout->Layout(permissions_content_); 693 layout->Layout(permissions_content_);
694 694
695 // Add site settings link. 695 // Add site settings link.
696 site_settings_link_ = new views::Link( 696 site_settings_link_ = new views::Link(
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
824 gfx::NativeWindow parent = 824 gfx::NativeWindow parent =
825 anchor_widget() ? anchor_widget()->GetNativeWindow() : nullptr; 825 anchor_widget() ? anchor_widget()->GetNativeWindow() : nullptr;
826 presenter_->RecordWebsiteSettingsAction( 826 presenter_->RecordWebsiteSettingsAction(
827 WebsiteSettings::WEBSITE_SETTINGS_CERTIFICATE_DIALOG_OPENED); 827 WebsiteSettings::WEBSITE_SETTINGS_CERTIFICATE_DIALOG_OPENED);
828 ShowCertificateViewerByID(web_contents_, parent, cert_id_); 828 ShowCertificateViewerByID(web_contents_, parent, cert_id_);
829 } else { 829 } else {
830 DevToolsWindow::OpenDevToolsWindow( 830 DevToolsWindow::OpenDevToolsWindow(
831 web_contents_, DevToolsToggleAction::ShowSecurityPanel()); 831 web_contents_, DevToolsToggleAction::ShowSecurityPanel());
832 } 832 }
833 } 833 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698