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 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/i18n/rtl.h" | 10 #include "base/i18n/rtl.h" |
(...skipping 591 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
602 | 602 |
603 base::string16 headline = | 603 base::string16 headline = |
604 permission_info_list.empty() | 604 permission_info_list.empty() |
605 ? base::string16() | 605 ? base::string16() |
606 : l10n_util::GetStringUTF16( | 606 : l10n_util::GetStringUTF16( |
607 IDS_WEBSITE_SETTINGS_TITLE_SITE_PERMISSIONS); | 607 IDS_WEBSITE_SETTINGS_TITLE_SITE_PERMISSIONS); |
608 views::View* permissions_section = | 608 views::View* permissions_section = |
609 CreateSection(headline, permissions_content_, nullptr); | 609 CreateSection(headline, permissions_content_, nullptr); |
610 permissions_tab_->AddChildView(permissions_section); | 610 permissions_tab_->AddChildView(permissions_section); |
611 | 611 |
612 bool is_incognito = web_contents_->GetBrowserContext()->IsOffTheRecord(); | |
613 | |
612 const int content_column = 0; | 614 const int content_column = 0; |
613 views::ColumnSet* column_set = layout->AddColumnSet(content_column); | 615 views::ColumnSet* column_set = layout->AddColumnSet(content_column); |
614 column_set->AddColumn(views::GridLayout::FILL, | 616 column_set->AddColumn(views::GridLayout::FILL, |
615 views::GridLayout::FILL, | 617 views::GridLayout::FILL, |
616 1, | 618 1, |
617 views::GridLayout::USE_PREF, | 619 views::GridLayout::USE_PREF, |
618 0, | 620 0, |
619 0); | 621 0); |
620 for (PermissionInfoList::const_iterator permission = | 622 for (PermissionInfoList::const_iterator permission = |
621 permission_info_list.begin(); | 623 permission_info_list.begin(); |
622 permission != permission_info_list.end(); | 624 permission != permission_info_list.end(); |
623 ++permission) { | 625 ++permission) { |
624 layout->StartRow(1, content_column); | 626 layout->StartRow(1, content_column); |
625 PermissionSelectorView* selector = new PermissionSelectorView( | 627 PermissionSelectorView* selector = new PermissionSelectorView( |
626 web_contents_ ? web_contents_->GetURL() : GURL::EmptyGURL(), | 628 web_contents_ ? web_contents_->GetURL() : GURL::EmptyGURL(), |
627 *permission); | 629 *permission, is_incognito); |
mlamouri (slow - plz ping)
2015/11/28 17:00:54
nit: could you simply call web_contents->GetBrowse
johnme
2015/11/30 15:37:20
Done.
| |
628 selector->AddObserver(this); | 630 selector->AddObserver(this); |
629 layout->AddView(selector, | 631 layout->AddView(selector, |
630 1, | 632 1, |
631 1, | 633 1, |
632 views::GridLayout::LEADING, | 634 views::GridLayout::LEADING, |
633 views::GridLayout::CENTER); | 635 views::GridLayout::CENTER); |
634 layout->AddPaddingRow(1, kPermissionsSectionRowSpacing); | 636 layout->AddPaddingRow(1, kPermissionsSectionRowSpacing); |
635 } | 637 } |
636 | 638 |
637 layout->Layout(permissions_content_); | 639 layout->Layout(permissions_content_); |
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
911 } | 913 } |
912 | 914 |
913 void WebsiteSettingsPopupView::StyledLabelLinkClicked(views::StyledLabel* label, | 915 void WebsiteSettingsPopupView::StyledLabelLinkClicked(views::StyledLabel* label, |
914 const gfx::Range& range, | 916 const gfx::Range& range, |
915 int event_flags) { | 917 int event_flags) { |
916 presenter_->RecordWebsiteSettingsAction( | 918 presenter_->RecordWebsiteSettingsAction( |
917 WebsiteSettings::WEBSITE_SETTINGS_SECURITY_DETAILS_OPENED); | 919 WebsiteSettings::WEBSITE_SETTINGS_SECURITY_DETAILS_OPENED); |
918 DevToolsWindow::OpenDevToolsWindow(web_contents_, | 920 DevToolsWindow::OpenDevToolsWindow(web_contents_, |
919 DevToolsToggleAction::ShowSecurityPanel()); | 921 DevToolsToggleAction::ShowSecurityPanel()); |
920 } | 922 } |
OLD | NEW |