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

Side by Side Diff: chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaSessionTabHelper.java

Issue 2110543004: Move JNI bindings for url_formatter from chrome to //components/url_formatter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.chrome.browser.media.ui; 5 package org.chromium.chrome.browser.media.ui;
6 6
7 import android.app.Activity; 7 import android.app.Activity;
8 import android.content.Intent; 8 import android.content.Intent;
9 import android.graphics.Bitmap; 9 import android.graphics.Bitmap;
10 import android.media.AudioManager; 10 import android.media.AudioManager;
11 import android.text.TextUtils; 11 import android.text.TextUtils;
12 12
13 import org.chromium.base.ContextUtils; 13 import org.chromium.base.ContextUtils;
14 import org.chromium.base.Log; 14 import org.chromium.base.Log;
15 import org.chromium.chrome.R; 15 import org.chromium.chrome.R;
16 import org.chromium.chrome.browser.metrics.MediaNotificationUma; 16 import org.chromium.chrome.browser.metrics.MediaNotificationUma;
17 import org.chromium.chrome.browser.metrics.MediaSessionUMA; 17 import org.chromium.chrome.browser.metrics.MediaSessionUMA;
18 import org.chromium.chrome.browser.tab.EmptyTabObserver; 18 import org.chromium.chrome.browser.tab.EmptyTabObserver;
19 import org.chromium.chrome.browser.tab.Tab; 19 import org.chromium.chrome.browser.tab.Tab;
20 import org.chromium.chrome.browser.tab.TabObserver; 20 import org.chromium.chrome.browser.tab.TabObserver;
21 import org.chromium.chrome.browser.util.UrlUtilities; 21 import org.chromium.components.url_formatter.UrlFormatter;
22 import org.chromium.content_public.browser.WebContents; 22 import org.chromium.content_public.browser.WebContents;
23 import org.chromium.content_public.browser.WebContentsObserver; 23 import org.chromium.content_public.browser.WebContentsObserver;
24 import org.chromium.content_public.common.MediaMetadata; 24 import org.chromium.content_public.common.MediaMetadata;
25 import org.chromium.ui.base.WindowAndroid; 25 import org.chromium.ui.base.WindowAndroid;
26 26
27 import java.net.URI; 27 import java.net.URI;
28 import java.net.URISyntaxException; 28 import java.net.URISyntaxException;
29 29
30 /** 30 /**
31 * A tab helper responsible for enabling/disabling media controls and passing 31 * A tab helper responsible for enabling/disabling media controls and passing
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 MediaNotificationManager.show( 178 MediaNotificationManager.show(
179 ContextUtils.getApplicationContext(), mNotificationInfoBuild er.build()); 179 ContextUtils.getApplicationContext(), mNotificationInfoBuild er.build());
180 } 180 }
181 181
182 @Override 182 @Override
183 public void onUrlUpdated(Tab tab) { 183 public void onUrlUpdated(Tab tab) {
184 assert tab == mTab; 184 assert tab == mTab;
185 185
186 String origin = mTab.getUrl(); 186 String origin = mTab.getUrl();
187 try { 187 try {
188 origin = UrlUtilities.formatUrlForSecurityDisplay(new URI(origin ), true); 188 origin = UrlFormatter.formatUrlForSecurityDisplay(new URI(origin ), true);
189 } catch (URISyntaxException e) { 189 } catch (URISyntaxException e) {
190 Log.e(TAG, "Unable to parse the origin from the URL. " 190 Log.e(TAG, "Unable to parse the origin from the URL. "
191 + "Using the full URL instead."); 191 + "Using the full URL instead.");
192 } 192 }
193 193
194 if (mOrigin != null && mOrigin.equals(origin)) return; 194 if (mOrigin != null && mOrigin.equals(origin)) return;
195 mOrigin = origin; 195 mOrigin = origin;
196 mFavicon = null; 196 mFavicon = null;
197 197
198 if (mNotificationInfoBuilder == null) return; 198 if (mNotificationInfoBuilder == null) return;
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 return false; 297 return false;
298 } 298 }
299 if (mFavicon != null && (icon.getWidth() < mFavicon.getWidth() 299 if (mFavicon != null && (icon.getWidth() < mFavicon.getWidth()
300 || icon.getHeight() < mFavicon.getHeight ())) { 300 || icon.getHeight() < mFavicon.getHeight ())) {
301 return false; 301 return false;
302 } 302 }
303 mFavicon = icon; 303 mFavicon = icon;
304 return true; 304 return true;
305 } 305 }
306 } 306 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698