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

Side by Side 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: Add OWNERS file Created 6 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.chrome.shell; 5 package org.chromium.chrome.shell;
6 6
7 import android.app.Activity; 7 import android.app.Activity;
8 import android.content.Intent; 8 import android.content.Intent;
9 import android.os.Bundle; 9 import android.os.Bundle;
10 import android.text.TextUtils; 10 import android.text.TextUtils;
(...skipping 10 matching lines...) Expand all
21 import org.chromium.base.CommandLine; 21 import org.chromium.base.CommandLine;
22 import org.chromium.base.ContentUriUtils; 22 import org.chromium.base.ContentUriUtils;
23 import org.chromium.base.MemoryPressureListener; 23 import org.chromium.base.MemoryPressureListener;
24 import org.chromium.base.VisibleForTesting; 24 import org.chromium.base.VisibleForTesting;
25 import org.chromium.base.library_loader.ProcessInitException; 25 import org.chromium.base.library_loader.ProcessInitException;
26 import org.chromium.chrome.browser.DevToolsServer; 26 import org.chromium.chrome.browser.DevToolsServer;
27 import org.chromium.chrome.browser.FileProviderHelper; 27 import org.chromium.chrome.browser.FileProviderHelper;
28 import org.chromium.chrome.browser.appmenu.AppMenuHandler; 28 import org.chromium.chrome.browser.appmenu.AppMenuHandler;
29 import org.chromium.chrome.browser.appmenu.AppMenuPropertiesDelegate; 29 import org.chromium.chrome.browser.appmenu.AppMenuPropertiesDelegate;
30 import org.chromium.chrome.browser.dom_distiller.DomDistillerTabUtils; 30 import org.chromium.chrome.browser.dom_distiller.DomDistillerTabUtils;
31 import org.chromium.chrome.browser.nfc.BeamController;
32 import org.chromium.chrome.browser.nfc.BeamProvider;
31 import org.chromium.chrome.browser.printing.PrintingControllerFactory; 33 import org.chromium.chrome.browser.printing.PrintingControllerFactory;
32 import org.chromium.chrome.browser.printing.TabPrinter; 34 import org.chromium.chrome.browser.printing.TabPrinter;
33 import org.chromium.chrome.browser.share.ShareHelper; 35 import org.chromium.chrome.browser.share.ShareHelper;
34 import org.chromium.chrome.shell.sync.SyncController; 36 import org.chromium.chrome.shell.sync.SyncController;
35 import org.chromium.components.dom_distiller.core.DomDistillerUrlUtils; 37 import org.chromium.components.dom_distiller.core.DomDistillerUrlUtils;
36 import org.chromium.content.browser.ActivityContentVideoViewClient; 38 import org.chromium.content.browser.ActivityContentVideoViewClient;
37 import org.chromium.content.browser.BrowserStartupController; 39 import org.chromium.content.browser.BrowserStartupController;
38 import org.chromium.content.browser.ContentViewCore; 40 import org.chromium.content.browser.ContentViewCore;
39 import org.chromium.content.browser.DeviceUtils; 41 import org.chromium.content.browser.DeviceUtils;
40 import org.chromium.printing.PrintManagerDelegateImpl; 42 import org.chromium.printing.PrintManagerDelegateImpl;
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 mDevToolsServer.setRemoteDebuggingEnabled( 167 mDevToolsServer.setRemoteDebuggingEnabled(
166 true, DevToolsServer.Security.ALLOW_DEBUG_PERMISSION); 168 true, DevToolsServer.Security.ALLOW_DEBUG_PERMISSION);
167 169
168 mPrintingController = PrintingControllerFactory.create(this); 170 mPrintingController = PrintingControllerFactory.create(this);
169 171
170 mSyncController = SyncController.get(this); 172 mSyncController = SyncController.get(this);
171 // In case this method is called after the first onStart(), we need to i nform the 173 // In case this method is called after the first onStart(), we need to i nform the
172 // SyncController that we have started. 174 // SyncController that we have started.
173 mSyncController.onStart(); 175 mSyncController.onStart();
174 ContentUriUtils.setFileProviderUtil(new FileProviderHelper()); 176 ContentUriUtils.setFileProviderUtil(new FileProviderHelper());
177
178 BeamController.registerForBeam(this, new BeamProvider() {
179 @Override
180 public String getTabUrlForBeam() {
181 ChromeShellTab tab = getActiveTab();
182 if (tab == null) return null;
183 return tab.getUrl();
184 }
185 });
175 } 186 }
176 187
177 @Override 188 @Override
178 protected void onDestroy() { 189 protected void onDestroy() {
179 super.onDestroy(); 190 super.onDestroy();
180 191
181 if (mDevToolsServer != null) mDevToolsServer.destroy(); 192 if (mDevToolsServer != null) mDevToolsServer.destroy();
182 mDevToolsServer = null; 193 mDevToolsServer = null;
183 } 194 }
184 195
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 @VisibleForTesting 414 @VisibleForTesting
404 public static void setActivityWindowAndroidFactory(ActivityWindowAndroidFact ory factory) { 415 public static void setActivityWindowAndroidFactory(ActivityWindowAndroidFact ory factory) {
405 sWindowAndroidFactory = factory; 416 sWindowAndroidFactory = factory;
406 } 417 }
407 418
408 @VisibleForTesting 419 @VisibleForTesting
409 public static void setAppMenuHandlerFactory(AppMenuHandlerFactory factory) { 420 public static void setAppMenuHandlerFactory(AppMenuHandlerFactory factory) {
410 sAppMenuHandlerFactory = factory; 421 sAppMenuHandlerFactory = factory;
411 } 422 }
412 } 423 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698