Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7918)

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

Issue 1841653003: Drop |languages| from {Format,Elide}Url* and IDNToUnicode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix typo in elide_url.cc Created 4 years, 8 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
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 2d333436fe9a5c8647111e9979ad8a05fb7a9da0..95970ab129a98165dba02144c8c56f0c0ab23171 100644
--- a/chrome/browser/ui/views/website_settings/permissions_bubble_view.cc
+++ b/chrome/browser/ui/views/website_settings/permissions_bubble_view.cc
@@ -18,9 +18,7 @@
#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 "components/prefs/pref_service.h"
#include "components/url_formatter/elide_url.h"
#include "grit/components_strings.h"
#include "ui/accessibility/ax_view_state.h"
@@ -157,7 +155,6 @@ class PermissionsBubbleDelegateView : public views::BubbleDelegateView,
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);
~PermissionsBubbleDelegateView() override;
@@ -200,7 +197,6 @@ 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),
@@ -216,7 +212,7 @@ PermissionsBubbleDelegateView::PermissionsBubbleDelegateView(
kItemMajorSpacing));
display_origin_ = url_formatter::FormatUrlForSecurityDisplay(
- requests[0]->GetOrigin(), languages);
+ requests[0]->GetOrigin());
ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
for (size_t index = 0; index < requests.size(); index++) {
@@ -444,9 +440,7 @@ void PermissionBubbleViewViews::Show(
bubble_delegate_->Close();
bubble_delegate_ =
- new PermissionsBubbleDelegateView(
- GetAnchorView(), GetAnchorArrow(), this,
- browser_->profile()->GetPrefs()->GetString(prefs::kAcceptLanguages),
+ new PermissionsBubbleDelegateView(GetAnchorView(), GetAnchorArrow(), this,
requests, values);
// Set |parent_window| because some valid anchors can become hidden.
« no previous file with comments | « chrome/browser/ui/views/status_bubble_views.cc ('k') | chrome/browser/ui/website_settings/website_settings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698