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

Unified Diff: chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java

Issue 615213003: Upstream NFC beam URL sharing code and add it to ChromeShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Start using uma :D Created 6 years, 3 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/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java
diff --git a/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java
index 48627d2a34d793e954c8a15b96aba8ce87aff631..3de8cf72039234fedf6c280b705f1111d85d781f 100644
--- a/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java
+++ b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java
@@ -28,6 +28,8 @@ import org.chromium.chrome.browser.FileProviderHelper;
import org.chromium.chrome.browser.appmenu.AppMenuHandler;
import org.chromium.chrome.browser.appmenu.AppMenuPropertiesDelegate;
import org.chromium.chrome.browser.dom_distiller.DomDistillerTabUtils;
+import org.chromium.chrome.browser.nfc.BeamController;
+import org.chromium.chrome.browser.nfc.BeamProvider;
import org.chromium.chrome.browser.printing.PrintingControllerFactory;
import org.chromium.chrome.browser.printing.TabPrinter;
import org.chromium.chrome.browser.share.ShareHelper;
@@ -172,6 +174,15 @@ public class ChromeShellActivity extends Activity implements AppMenuPropertiesDe
// SyncController that we have started.
mSyncController.onStart();
ContentUriUtils.setFileProviderUtil(new FileProviderHelper());
+
+ BeamController.registerForBeam(this, new BeamProvider() {
+ @Override
+ public String getTabUrlForBeam() {
+ ChromeShellTab tab = getActiveTab();
+ if (tab == null) return null;
+ return tab.getUrl();
+ }
+ });
}
@Override

Powered by Google App Engine
This is Rietveld 408576698