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..e1dd402fb394ad0b9c653d0c3ac13b890226eeef 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 |
@@ -18,9 +18,15 @@ public class PhysicalWebShareActivity extends ShareActivity { |
protected void handleShareAction(ChromeActivity triggeringActivity) { |
String url = triggeringActivity.getActivityTab().getUrl(); |
- Intent intent = new Intent(this, PhysicalWebBroadcastService.class); |
- intent.putExtra(PhysicalWebBroadcastService.DISPLAY_URL_KEY, url); |
- startService(intent); |
+ if (!PhysicalWeb.sharingIsOptedIn()) { |
+ // This shows an interstitial for the user to opt-in for sending URL to Google. |
+ Intent intent = new Intent(this, PhysicalWebShareEntryActivity.class); |
+ intent.putExtra(PhysicalWebShareEntryActivity.SHARING_ENTRY_URL, url); |
+ triggeringActivity.startActivity(intent); |
+ return; |
+ } |
+ |
+ PhysicalWebBroadcastService.startBroadcastService(url); |
} |
/** |