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/page_info/page_info.h" | 5 #include "chrome/browser/ui/page_info/page_info.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <string> | 10 #include <string> |
(...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
440 | 440 |
441 void PageInfo::OpenSiteSettingsView() { | 441 void PageInfo::OpenSiteSettingsView() { |
442 // By default, this opens the general Content Settings pane. If the | 442 // By default, this opens the general Content Settings pane. If the |
443 // |kSiteSettings| and/or |kSiteDetails| flags are enabled this opens a | 443 // |kSiteSettings| and/or |kSiteDetails| flags are enabled this opens a |
444 // settings page specific to the current origin of the page. crbug.com/655876 | 444 // settings page specific to the current origin of the page. crbug.com/655876 |
445 url::Origin site_origin = url::Origin(site_url()); | 445 url::Origin site_origin = url::Origin(site_url()); |
446 std::string link_destination(chrome::kChromeUIContentSettingsURL); | 446 std::string link_destination(chrome::kChromeUIContentSettingsURL); |
447 if ((base::CommandLine::ForCurrentProcess()->HasSwitch( | 447 if ((base::CommandLine::ForCurrentProcess()->HasSwitch( |
448 switches::kEnableSiteSettings) || | 448 switches::kEnableSiteSettings) || |
449 base::FeatureList::IsEnabled(features::kSiteDetails)) && | 449 base::FeatureList::IsEnabled(features::kSiteDetails)) && |
450 !site_origin.unique()) { | 450 !site_origin.opaque()) { |
451 std::string origin_string = site_origin.Serialize(); | 451 std::string origin_string = site_origin.Serialize(); |
452 url::RawCanonOutputT<char> percent_encoded_origin; | 452 url::RawCanonOutputT<char> percent_encoded_origin; |
453 url::EncodeURIComponent(origin_string.c_str(), origin_string.length(), | 453 url::EncodeURIComponent(origin_string.c_str(), origin_string.length(), |
454 &percent_encoded_origin); | 454 &percent_encoded_origin); |
455 link_destination = chrome::kChromeUISiteDetailsPrefixURL + | 455 link_destination = chrome::kChromeUISiteDetailsPrefixURL + |
456 std::string(percent_encoded_origin.data(), | 456 std::string(percent_encoded_origin.data(), |
457 percent_encoded_origin.length()); | 457 percent_encoded_origin.length()); |
458 } | 458 } |
459 web_contents()->OpenURL( | 459 web_contents()->OpenURL( |
460 content::OpenURLParams(GURL(link_destination), content::Referrer(), | 460 content::OpenURLParams(GURL(link_destination), content::Referrer(), |
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
855 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_; | 855 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_; |
856 info.show_change_password_buttons = show_change_password_buttons_; | 856 info.show_change_password_buttons = show_change_password_buttons_; |
857 ui_->SetIdentityInfo(info); | 857 ui_->SetIdentityInfo(info); |
858 #if defined(SAFE_BROWSING_DB_LOCAL) && !defined(OS_MACOSX) | 858 #if defined(SAFE_BROWSING_DB_LOCAL) && !defined(OS_MACOSX) |
859 if (password_protection_service_ && show_change_password_buttons_) { | 859 if (password_protection_service_ && show_change_password_buttons_) { |
860 password_protection_service_->OnWarningShown( | 860 password_protection_service_->OnWarningShown( |
861 web_contents(), safe_browsing::PasswordProtectionService::PAGE_INFO); | 861 web_contents(), safe_browsing::PasswordProtectionService::PAGE_INFO); |
862 } | 862 } |
863 #endif | 863 #endif |
864 } | 864 } |
OLD | NEW |