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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterDialogController.java

Issue 2800833003: Revert of Android: Remove GetApplicationContext part 2 (Closed)
Patch Set: Created 3 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/android/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterDialogController.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterDialogController.java b/chrome/android/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterDialogController.java
index 7217bb8b590967c25620f9bddaa37ee1f6bb2a47..4d21c7d96e49e573d48db8865f04a9d5ceebdca2 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterDialogController.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterDialogController.java
@@ -4,6 +4,7 @@
package org.chromium.chrome.browser.media.router;
+import android.content.Context;
import android.support.v7.app.MediaRouteChooserDialogFragment;
import android.support.v7.app.MediaRouteControllerDialogFragment;
@@ -23,16 +24,19 @@
"android.support.v7.mediarouter:MediaRouteControllerDialogFragment";
private final long mNativeDialogController;
+ private final Context mApplicationContext;
private MediaRouteDialogManager mDialogManager;
/**
* Returns a new initialized {@link ChromeMediaRouterDialogController}.
* @param nativeDialogController the handle of the native object.
+ * @param context the application context.
* @return a new dialog controller to use from the native side.
*/
@CalledByNative
- public static ChromeMediaRouterDialogController create(long nativeDialogController) {
- return new ChromeMediaRouterDialogController(nativeDialogController);
+ public static ChromeMediaRouterDialogController create(
+ long nativeDialogController, Context context) {
+ return new ChromeMediaRouterDialogController(nativeDialogController, context);
}
/**
@@ -46,7 +50,7 @@
MediaSource source = MediaSource.from(sourceUrn);
if (source == null) return;
- mDialogManager = new MediaRouteChooserDialogManager(source, this);
+ mDialogManager = new MediaRouteChooserDialogManager(source, mApplicationContext, this);
mDialogManager.openDialog();
}
@@ -62,7 +66,8 @@
MediaSource source = MediaSource.from(sourceUrn);
if (source == null) return;
- mDialogManager = new MediaRouteControllerDialogManager(source, mediaRouteId, this);
+ mDialogManager = new MediaRouteControllerDialogManager(
+ source, mediaRouteId, mApplicationContext, this);
mDialogManager.openDialog();
}
@@ -109,8 +114,9 @@
nativeOnDialogCancelled(mNativeDialogController);
}
- private ChromeMediaRouterDialogController(long nativeDialogController) {
+ private ChromeMediaRouterDialogController(long nativeDialogController, Context context) {
mNativeDialogController = nativeDialogController;
+ mApplicationContext = context;
}
native void nativeOnDialogCancelled(long nativeMediaRouterDialogControllerAndroid);

Powered by Google App Engine
This is Rietveld 408576698