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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/physicalweb/PhysicalWebShareActivity.java

Issue 2755003003: Add Interstitial for user consent (Closed)
Patch Set: Removing Comment Change from Service Created 3 years, 9 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/physicalweb/PhysicalWebShareActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/PhysicalWebShareActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/PhysicalWebShareActivity.java
index 09891aa8bbbe61dbc91eb2978a1d954d048f65cc..fea219ef8e262236cbbcc778266617b87e68ec6d 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/PhysicalWebShareActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/PhysicalWebShareActivity.java
@@ -7,6 +7,8 @@ package org.chromium.chrome.browser.physicalweb;
import android.content.Intent;
import android.os.Build;
+import org.chromium.base.ContextUtils;
+import org.chromium.chrome.R;
import org.chromium.chrome.browser.ChromeActivity;
import org.chromium.chrome.browser.share.ShareActivity;
@@ -18,7 +20,17 @@ public class PhysicalWebShareActivity extends ShareActivity {
protected void handleShareAction(ChromeActivity triggeringActivity) {
String url = triggeringActivity.getActivityTab().getUrl();
- Intent intent = new Intent(this, PhysicalWebBroadcastService.class);
+ if (!PhysicalWeb.sharingIsOptedIn()) {
+ triggeringActivity.onMenuOrKeyboardAction(R.id.physical_web_sharing_id, true);
mattreynolds 2017/03/17 00:52:39 Please add a comment explaining that this shows th
iankc 2017/03/17 01:46:11 Done.
+ return;
+ }
+
+ startBroadcastService(url);
+ }
+
+ private void startBroadcastService(String url) {
+ Intent intent =
+ new Intent(ContextUtils.getApplicationContext(), PhysicalWebBroadcastService.class);
intent.putExtra(PhysicalWebBroadcastService.DISPLAY_URL_KEY, url);
startService(intent);
}

Powered by Google App Engine
This is Rietveld 408576698