chrome/browser/ui/android/usb_chooser_dialog_android.cc - Issue 1841653003: Drop |languages| from {Format,Elide}Url* and IDNToUnicode

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/android/usb_chooser_dialog_android.cc

Issue 1841653003: Drop |languages| from {Format,Elide}Url* and IDNToUnicode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebased, most Android targets locally built successfully Created 4 years, 9 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

« chrome/browser/android/omnibox/autocomplete_controller_android.cc ('K') | « chrome/browser/ui/android/bluetooth_chooser_android.cc ('k') | chrome/browser/ui/bookmarks/bookmark_utils.h » ('j') | components/omnibox/browser/bookmark_provider.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/android/usb_chooser_dialog_android.cc

diff --git a/chrome/browser/ui/android/usb_chooser_dialog_android.cc b/chrome/browser/ui/android/usb_chooser_dialog_android.cc

index 06e11c3f6377e8e7ddd47263349d487667ebe67f..f1454a314d44453b660396d9320d11a97b9adbab 100644

--- a/chrome/browser/ui/android/usb_chooser_dialog_android.cc

+++ b/chrome/browser/ui/android/usb_chooser_dialog_android.cc

@@ -17,9 +17,7 @@

#include "chrome/browser/usb/usb_chooser_context.h"

#include "chrome/browser/usb/usb_chooser_context_factory.h"

#include "chrome/browser/usb/web_usb_histograms.h"

-#include "chrome/common/pref_names.h"

#include "chrome/common/url_constants.h"

-#include "components/prefs/pref_service.h"

#include "components/url_formatter/elide_url.h"

#include "content/public/browser/android/content_view_core.h"

#include "content/public/browser/render_frame_host.h"

@@ -60,14 +58,10 @@ UsbChooserDialogAndroid::UsbChooserDialogAndroid(

->GetWindowAndroid()

->GetJavaObject();

JNIEnv* env = base::android::AttachCurrentThread();

- Profile* profile =

- Profile::FromBrowserContext(web_contents->GetBrowserContext());

- std::string languages =

- profile->GetPrefs()->GetString(prefs::kAcceptLanguages);

base::android::ScopedJavaLocalRef<jstring> origin_string =

base::android::ConvertUTF16ToJavaString(

env, url_formatter::FormatUrlForSecurityDisplay(

- render_frame_host->GetLastCommittedURL(), languages));

+ render_frame_host->GetLastCommittedURL()));

ChromeSecurityStateModelClient* security_model_client =

ChromeSecurityStateModelClient::FromWebContents(web_contents);

DCHECK(security_model_client);