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

Unified Diff: chrome/android/java_staging/src/org/chromium/chrome/browser/CompositorChromeActivity.java

Issue 1164973003: Add initial support for runtime permissions in android M. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Appease findbugs Created 5 years, 6 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_staging/src/org/chromium/chrome/browser/CompositorChromeActivity.java
diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/CompositorChromeActivity.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/CompositorChromeActivity.java
index 9b9e7c59d81ac635b89bcbfa67ed8ae61c15b2fa..fd20655523994081736e369fe86d9802bb415203 100644
--- a/chrome/android/java_staging/src/org/chromium/chrome/browser/CompositorChromeActivity.java
+++ b/chrome/android/java_staging/src/org/chromium/chrome/browser/CompositorChromeActivity.java
@@ -71,6 +71,7 @@ import org.chromium.content_public.browser.LoadUrlParams;
import org.chromium.content_public.browser.readback_types.ReadbackResponse;
import org.chromium.printing.PrintManagerDelegateImpl;
import org.chromium.printing.PrintingController;
+import org.chromium.ui.base.ActivityWindowAndroid;
import org.chromium.ui.base.DeviceFormFactor;
import org.chromium.ui.base.PageTransition;
import org.chromium.ui.base.WindowAndroid;
@@ -91,7 +92,7 @@ public abstract class CompositorChromeActivity extends ChromeActivity
private static final String TAG = "CompositorChromeActivity";
- private WindowAndroid mWindowAndroid;
+ private ActivityWindowAndroid mWindowAndroid;
private ChromeFullscreenManager mFullscreenManager;
private CompositorViewHolder mCompositorViewHolder;
private ContextualSearchManager mContextualSearchManager;
@@ -331,6 +332,15 @@ public abstract class CompositorChromeActivity extends ChromeActivity
return mWindowAndroid.onActivityResult(requestCode, resultCode, intent);
}
+ // @Override[ANDROID-M]
+ public void onRequestPermissionsResult(int requestCode, String[] permissions,
+ int[] grantResults) {
+ if (mWindowAndroid != null) {
+ mWindowAndroid.onRequestPermissionsResult(requestCode, permissions, grantResults);
+ }
+ //super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+ }
+
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);

Powered by Google App Engine
This is Rietveld 408576698