Change PermissionBubbleRequest::GetRequestingHostname to GetOrigin

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/website_settings/permissions_bubble_view.h"
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/prefs/pref_service.h"
@@ skipping 173 matching lines @@
 
   // Updates the anchor's arrow and view. Also repositions the bubble so it's
   // displayed in the correct location.
   void UpdateAnchor(views::View* anchor_view,
                     views::BubbleBorder::Arrow anchor_arrow);
 
  private:
   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_;
 
   DISALLOW_COPY_AND_ASSIGN(PermissionsBubbleDelegateView);
 };
 
 PermissionsBubbleDelegateView::PermissionsBubbleDelegateView(
     views::View* anchor_view,
     views::BubbleBorder::Arrow anchor_arrow,
     PermissionBubbleViewViews* owner,
     const std::string& languages,
     const std::vector<PermissionBubbleRequest*>& requests,
     const std::vector<bool>& accept_state)
     : views::BubbleDelegateView(anchor_view, anchor_arrow),
       owner_(owner),
       allow_(nullptr),
       deny_(nullptr) {
   DCHECK(!requests.empty());
 
   RemoveAllChildViews(true);
   customize_comboboxes_.clear();
   set_close_on_esc(true);
   set_close_on_deactivate(false);
 
   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++) {
     DCHECK(index < accept_state.size());
     // The row is laid out containing a leading-aligned label area and a
     // trailing column which will be filled if there are multiple permission
     // requests.
     views::View* row = new views::View();
     views::GridLayout* row_layout = new views::GridLayout(row);
     row->SetLayoutManager(row_layout);
@@ skipping 21 matching lines @@
     icon->SetTooltipText(base::string16());  // Redundant with the text fragment
     label_container->AddChildView(icon);
     views::Label* label =
         new views::Label(requests.at(index)->GetMessageTextFragment());
     label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     label_container->AddChildView(label);
     row_layout->AddView(label_container);
 
     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);
     } else {
       row_layout->AddView(new views::View());
     }
 
     AddChildView(row);
   }
 
@@ skipping 59 matching lines @@
   return true;
 }
 
 const gfx::FontList& PermissionsBubbleDelegateView::GetTitleFontList() const {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   return rb.GetFontList(ui::ResourceBundle::BaseFont);
 }
 
 base::string16 PermissionsBubbleDelegateView::GetWindowTitle() const {
   return l10n_util::GetStringFUTF16(IDS_PERMISSIONS_BUBBLE_PROMPT,
-                                    hostname_);
+                                    display_origin_);
 }
 
 void PermissionsBubbleDelegateView::SizeToContents() {
   BubbleDelegateView::SizeToContents();
 }
 
 void PermissionsBubbleDelegateView::OnWidgetDestroying(views::Widget* widget) {
   views::BubbleDelegateView::OnWidgetDestroying(widget);
   if (owner_) {
     owner_->Closing();
@@ skipping 145 matching lines @@
 
 void PermissionBubbleViewViews::Accept() {
   if (delegate_)
     delegate_->Accept();
 }
 
 void PermissionBubbleViewViews::Deny() {
   if (delegate_)
     delegate_->Deny();
 }