chrome/browser/android/fullscreen/fullscreen_infobar_delegate.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/android/fullscreen/fullscreen_infobar_delegate.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

« no previous file with comments | « android_webview/browser/aw_javascript_dialog_manager.cc ('k') | chrome/browser/android/omnibox/autocomplete_controller_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/android/fullscreen/fullscreen_infobar_delegate.cc

diff --git a/chrome/browser/android/fullscreen/fullscreen_infobar_delegate.cc b/chrome/browser/android/fullscreen/fullscreen_infobar_delegate.cc

index 80ebd0cdceb462c44a8d117830b2283b0b864e09..074333e2d050becc05347883d94dc256e8f51462 100644

--- a/chrome/browser/android/fullscreen/fullscreen_infobar_delegate.cc

+++ b/chrome/browser/android/fullscreen/fullscreen_infobar_delegate.cc

@@ -9,11 +9,8 @@

#include "chrome/browser/android/android_theme_resources.h"

#include "chrome/browser/android/tab_android.h"

#include "chrome/browser/infobars/infobar_service.h"

-#include "chrome/browser/profiles/profile_manager.h"

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

#include "chrome/grit/generated_resources.h"

#include "components/infobars/core/infobar.h"

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

#include "components/url_formatter/elide_url.h"

#include "grit/components_strings.h"

#include "jni/FullscreenInfoBarDelegate_jni.h"

@@ -70,13 +67,9 @@ int FullscreenInfoBarDelegate::GetIconId() const {

}

base::string16 FullscreenInfoBarDelegate::GetMessageText() const {

- Profile* profile =

- ProfileManager::GetActiveUserProfile()->GetOriginalProfile();

- std::string language =

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

return l10n_util::GetStringFUTF16(

IDS_FULLSCREEN_INFOBAR_TEXT,

- url_formatter::FormatUrlForSecurityDisplay(origin_, language));

+ url_formatter::FormatUrlForSecurityDisplay(origin_));

}

base::string16 FullscreenInfoBarDelegate::GetButtonLabel(