Permission bubble should display URL with appropriate language pref

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 "base/prefs/pref_service.h"
 #include "base/strings/string16.h"
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/views/website_settings/permission_selector_view.h"
 #include "chrome/browser/ui/views/website_settings/permission_selector_view_observer.h"
 #include "chrome/browser/ui/website_settings/permission_bubble_request.h"
+#include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "net/base/net_util.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/text_constants.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/button/label_button.h"
@@ skipping 147 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // View implementation for the permissions bubble.
 class PermissionsBubbleDelegateView : public views::BubbleDelegateView,
                                       public views::ButtonListener,
                                       public views::ComboboxListener,
                                       public PermissionCombobox::Listener {
  public:
   PermissionsBubbleDelegateView(
       views::View* anchor,
       PermissionBubbleViewViews* owner,
+      Profile* profile,
       const std::vector<PermissionBubbleRequest*>& requests,
       const std::vector<bool>& accept_state,
       bool customization_mode);
   ~PermissionsBubbleDelegateView() override;
 
   void Close();
   void SizeToContents();
 
   // BubbleDelegateView:
   bool ShouldShowCloseButton() const override;
@@ skipping 19 matching lines @@
   base::string16 hostname_;
   scoped_ptr<PermissionMenuModel> menu_button_model_;
   std::vector<PermissionCombobox*> customize_comboboxes_;
 
   DISALLOW_COPY_AND_ASSIGN(PermissionsBubbleDelegateView);
 };
 
 PermissionsBubbleDelegateView::PermissionsBubbleDelegateView(
     views::View* anchor,
     PermissionBubbleViewViews* owner,
+    Profile* profile,
     const std::vector<PermissionBubbleRequest*>& requests,
     const std::vector<bool>& accept_state,
     bool customization_mode)
     : views::BubbleDelegateView(anchor, views::BubbleBorder::TOP_LEFT),
       owner_(owner),
       allow_(NULL),
       deny_(NULL),
       allow_combobox_(NULL) {
   DCHECK(!requests.empty());
 
   RemoveAllChildViews(true);
   customize_comboboxes_.clear();
   set_close_on_esc(false);
   set_close_on_deactivate(false);
 
   SetLayoutManager(new views::BoxLayout(
       views::BoxLayout::kVertical, kBubbleOuterMargin, 0, kItemMajorSpacing));
 
-  // TODO(gbillock): support other languages than English.
+  DCHECK(profile);
+  std::string languages =
+      profile->GetPrefs()->GetString(prefs::kAcceptLanguages);

[sky, 2015/01/29 17:40:44]

One question though. Can PermissionBubbleViewViews take the value of
kAcceptLanguages in its constructor rather than the profile? Or might the value
change?

[felt, 2015/01/29 19:51:13]

Looked into this. Changing the language will prompt a restart, so the value
should not change. Updated accordingly.

   hostname_ = net::FormatUrl(requests[0]->GetRequestingHostname(),
-                             "en",
+                             languages,
                              net::kFormatUrlOmitUsernamePassword |
                              net::kFormatUrlOmitTrailingSlashOnBareHostname,
                              net::UnescapeRule::SPACES, NULL, NULL, NULL);
 
   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 during customization with a
     // combobox.
@@ skipping 162 matching lines @@
       owner_->SetCustomizationMode();
     else if (combobox->selected_index() ==
              CustomizeAllowComboboxModel::INDEX_ALLOW)
       owner_->Accept();
   }
 }
 
 //////////////////////////////////////////////////////////////////////////////
 // PermissionBubbleViewViews
 
-PermissionBubbleViewViews::PermissionBubbleViewViews(views::View* anchor_view)
+PermissionBubbleViewViews::PermissionBubbleViewViews(
+    views::View* anchor_view,
+    Profile* profile)
     : anchor_view_(anchor_view),
       delegate_(NULL),
-      bubble_delegate_(NULL) {}
+      bubble_delegate_(NULL),
+      profile_(profile) {}
 
 PermissionBubbleViewViews::~PermissionBubbleViewViews() {
   if (delegate_)
     delegate_->SetView(NULL);
 }
 
 void PermissionBubbleViewViews::SetDelegate(Delegate* delegate) {
   delegate_ = delegate;
 }
 
 void PermissionBubbleViewViews::Show(
     const std::vector<PermissionBubbleRequest*>& requests,
     const std::vector<bool>& values,
     bool customization_mode) {
   if (bubble_delegate_ != NULL)
     bubble_delegate_->Close();
 
   bubble_delegate_ =
-      new PermissionsBubbleDelegateView(anchor_view_, this,
+      new PermissionsBubbleDelegateView(anchor_view_, this, profile_,
                                         requests, values, customization_mode);
   views::BubbleDelegateView::CreateBubble(bubble_delegate_)->Show();
   bubble_delegate_->SizeToContents();
 }
 
 bool PermissionBubbleViewViews::CanAcceptRequestUpdate() {
   return !(bubble_delegate_ && bubble_delegate_->IsMouseHovered());
 }
 
 void PermissionBubbleViewViews::Hide() {
@@ skipping 26 matching lines @@
 
 void PermissionBubbleViewViews::Deny() {
   if (delegate_)
     delegate_->Deny();
 }
 
 void PermissionBubbleViewViews::SetCustomizationMode() {
   if (delegate_)
     delegate_->SetCustomizationMode();
 }