chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationUIManager.java - Issue 1426453003: Notification custom layouts: improve origin display.

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/android/java/src/org/chromium/chrome/browser/notifications/NotificationUIManager.java

Issue 1426453003: Notification custom layouts: improve origin display. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix test. Created 5 years, 2 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 | « chrome/android/java/src/org/chromium/chrome/browser/UrlUtilities.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/notifications/NotificationUIManagerTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationUIManager.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationUIManager.java b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationUIManager.java

index 7a08f9c457cbf0ef50695b0df70cdea5f961725d..b51a94655963d64396eacff0a63dc34f47ccfa4f 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationUIManager.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationUIManager.java

@@ -26,6 +26,7 @@

import org.chromium.base.metrics.RecordUserAction;

import org.chromium.chrome.R;

import org.chromium.chrome.browser.ChromeSwitches;

+import org.chromium.chrome.browser.UrlUtilities;

import org.chromium.chrome.browser.preferences.Preferences;

import org.chromium.chrome.browser.preferences.PreferencesLauncher;

import org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences;

@@ -437,7 +438,8 @@ private void displayNotification(long persistentNotificationId, String origin, S

NotificationConstants.ACTION_CLOSE_NOTIFICATION,

persistentNotificationId, origin, tag, -1 /* actionIndex */))

.setTicker(createTickerText(title, body))

- .setOrigin(origin);

+ .setOrigin(UrlUtilities.formatUrlForSecurityDisplay(

+ origin, false /* showScheme */));

for (int actionIndex = 0; actionIndex < actionTitles.length; actionIndex++) {

notificationBuilder.addAction(