chrome/browser/ui/views/website_settings/permissions_bubble_view.cc - Issue 1637913002: Change PermissionBubbleRequest::GetRequestingHostname to GetOrigin

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/website_settings/permissions_bubble_view.cc

Issue 1637913002: Change PermissionBubbleRequest::GetRequestingHostname to GetOrigin (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 11 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm ('k') | chrome/browser/ui/website_settings/mock_permission_bubble_request.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/website_settings/permissions_bubble_view.cc

diff --git a/chrome/browser/ui/views/website_settings/permissions_bubble_view.cc b/chrome/browser/ui/views/website_settings/permissions_bubble_view.cc

index b3ce912d9d733affe03aa68dc7789dbca709d2cd..da1b63e5c8983151a96e9b4c588c295b1322f942 100644

--- a/chrome/browser/ui/views/website_settings/permissions_bubble_view.cc

+++ b/chrome/browser/ui/views/website_settings/permissions_bubble_view.cc

@@ -191,7 +191,7 @@ class PermissionsBubbleDelegateView : public views::BubbleDelegateView,

PermissionBubbleViewViews* owner_;

views::Button* allow_;

views::Button* deny_;

- base::string16 hostname_;

+ base::string16 display_origin_;

scoped_ptr<PermissionMenuModel> menu_button_model_;

std::vector<PermissionCombobox*> customize_comboboxes_;

@@ -219,8 +219,8 @@ PermissionsBubbleDelegateView::PermissionsBubbleDelegateView(

SetLayoutManager(new views::BoxLayout(

views::BoxLayout::kVertical, kBubbleOuterMargin, 0, kItemMajorSpacing));

- hostname_ = url_formatter::FormatUrlForSecurityDisplay(

- requests[0]->GetRequestingHostname(), languages);

+ display_origin_ = url_formatter::FormatUrlForSecurityDisplay(

+ requests[0]->GetOrigin(), languages);

ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();

for (size_t index = 0; index < requests.size(); index++) {

@@ -262,9 +262,7 @@ PermissionsBubbleDelegateView::PermissionsBubbleDelegateView(

if (requests.size() > 1) {

PermissionCombobox* combobox = new PermissionCombobox(

- this,

- index,

- requests[index]->GetRequestingHostname(),

+ this, index, requests[index]->GetOrigin(),

accept_state[index] ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK);

row_layout->AddView(combobox);

customize_comboboxes_.push_back(combobox);

@@ -344,7 +342,7 @@ const gfx::FontList& PermissionsBubbleDelegateView::GetTitleFontList() const {

base::string16 PermissionsBubbleDelegateView::GetWindowTitle() const {

return l10n_util::GetStringFUTF16(IDS_PERMISSIONS_BUBBLE_PROMPT,

- hostname_);

+ display_origin_);

}

void PermissionsBubbleDelegateView::SizeToContents() {