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

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

Issue 2702923002: Page Info: Hide default permissions with a value of Ask if the default is Ask. (Closed)
Patch Set: Fix #ifdef to allow testing MacViews. Created 3 years, 10 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>
(...skipping 659 matching lines...) Expand 10 before | Expand all | Expand 10 after
670 views::View* link_section = new views::View(); 670 views::View* link_section = new views::View();
671 const int kLinkMarginTop = 4; 671 const int kLinkMarginTop = 4;
672 link_section->SetLayoutManager(new views::BoxLayout( 672 link_section->SetLayoutManager(new views::BoxLayout(
673 views::BoxLayout::kHorizontal, 0, kLinkMarginTop, 0)); 673 views::BoxLayout::kHorizontal, 0, kLinkMarginTop, 0));
674 link_section->AddChildView(site_settings_link); 674 link_section->AddChildView(site_settings_link);
675 site_settings_view_->AddChildView(link_section); 675 site_settings_view_->AddChildView(link_section);
676 676
677 SizeToContents(); 677 SizeToContents();
678 } 678 }
679 679
680 void WebsiteSettingsPopupView::UpdatePermissionButton(
681 WebsiteSettingsUI::VisiblePermissions visible_permissions) {
682 // TODO(crbug.com/657267)
683 }
684
680 void WebsiteSettingsPopupView::SetIdentityInfo( 685 void WebsiteSettingsPopupView::SetIdentityInfo(
681 const IdentityInfo& identity_info) { 686 const IdentityInfo& identity_info) {
682 std::unique_ptr<WebsiteSettingsUI::SecurityDescription> security_description = 687 std::unique_ptr<WebsiteSettingsUI::SecurityDescription> security_description =
683 identity_info.GetSecurityDescription(); 688 identity_info.GetSecurityDescription();
684 689
685 summary_text_ = security_description->summary; 690 summary_text_ = security_description->summary;
686 GetWidget()->UpdateWindowTitle(); 691 GetWidget()->UpdateWindowTitle();
687 692
688 if (identity_info.certificate) { 693 if (identity_info.certificate) {
689 certificate_ = identity_info.certificate; 694 certificate_ = identity_info.certificate;
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
754 WebsiteSettings::WEBSITE_SETTINGS_CONNECTION_HELP_OPENED); 759 WebsiteSettings::WEBSITE_SETTINGS_CONNECTION_HELP_OPENED);
755 break; 760 break;
756 case STYLED_LABEL_RESET_CERTIFICATE_DECISIONS: 761 case STYLED_LABEL_RESET_CERTIFICATE_DECISIONS:
757 presenter_->OnRevokeSSLErrorBypassButtonPressed(); 762 presenter_->OnRevokeSSLErrorBypassButtonPressed();
758 GetWidget()->Close(); 763 GetWidget()->Close();
759 break; 764 break;
760 default: 765 default:
761 NOTREACHED(); 766 NOTREACHED();
762 } 767 }
763 } 768 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698