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> |
(...skipping 611 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
622 | 622 |
623 void WebsiteSettingsPopupView::SetPermissionInfo( | 623 void WebsiteSettingsPopupView::SetPermissionInfo( |
624 const PermissionInfoList& permission_info_list, | 624 const PermissionInfoList& permission_info_list, |
625 const ChosenObjectInfoList& chosen_object_info_list) { | 625 const ChosenObjectInfoList& chosen_object_info_list) { |
626 // When a permission is changed, WebsiteSettings::OnSitePermissionChanged() | 626 // When a permission is changed, WebsiteSettings::OnSitePermissionChanged() |
627 // calls this method with updated permissions. However, PermissionSelectorView | 627 // calls this method with updated permissions. However, PermissionSelectorView |
628 // will have already updated its state, so it's already reflected in the UI. | 628 // will have already updated its state, so it's already reflected in the UI. |
629 // In addition, if a permission is set to the default setting, WebsiteSettings | 629 // In addition, if a permission is set to the default setting, WebsiteSettings |
630 // removes it from |permission_info_list|, but the button should remain. | 630 // removes it from |permission_info_list|, but the button should remain. |
631 if (permissions_content_) { | 631 if (permissions_content_) { |
632 STLDeleteContainerPointers(chosen_object_info_list.begin(), | 632 base::STLDeleteContainerPointers(chosen_object_info_list.begin(), |
633 chosen_object_info_list.end()); | 633 chosen_object_info_list.end()); |
634 return; | 634 return; |
635 } | 635 } |
636 | 636 |
637 permissions_content_ = new views::View(); | 637 permissions_content_ = new views::View(); |
638 views::GridLayout* layout = new views::GridLayout(permissions_content_); | 638 views::GridLayout* layout = new views::GridLayout(permissions_content_); |
639 permissions_content_->SetLayoutManager(layout); | 639 permissions_content_->SetLayoutManager(layout); |
640 | 640 |
641 base::string16 headline = | 641 base::string16 headline = |
642 permission_info_list.empty() | 642 permission_info_list.empty() |
643 ? base::string16() | 643 ? base::string16() |
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
813 gfx::NativeWindow parent = | 813 gfx::NativeWindow parent = |
814 anchor_widget() ? anchor_widget()->GetNativeWindow() : nullptr; | 814 anchor_widget() ? anchor_widget()->GetNativeWindow() : nullptr; |
815 presenter_->RecordWebsiteSettingsAction( | 815 presenter_->RecordWebsiteSettingsAction( |
816 WebsiteSettings::WEBSITE_SETTINGS_CERTIFICATE_DIALOG_OPENED); | 816 WebsiteSettings::WEBSITE_SETTINGS_CERTIFICATE_DIALOG_OPENED); |
817 ShowCertificateViewerByID(web_contents_, parent, cert_id_); | 817 ShowCertificateViewerByID(web_contents_, parent, cert_id_); |
818 } else { | 818 } else { |
819 DevToolsWindow::OpenDevToolsWindow( | 819 DevToolsWindow::OpenDevToolsWindow( |
820 web_contents_, DevToolsToggleAction::ShowSecurityPanel()); | 820 web_contents_, DevToolsToggleAction::ShowSecurityPanel()); |
821 } | 821 } |
822 } | 822 } |
OLD | NEW |