chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java - Issue 2697933002: Remove factory methods from ChromeApplication.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java

Issue 2697933002: Remove factory methods from ChromeApplication. (Closed)

Patch Set: Rebase Created 3 years, 10 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

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/childaccounts/ChildAccountFeedbackReporter.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/datausage/ExternalDataUseObserver.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java

index e676e9cd79b04bfbe489f5f544518aae84678300..4c3eee8e7a1e3ffcf42febc2b7ac428fd24caedf 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java

@@ -39,6 +39,7 @@ import org.chromium.base.annotations.SuppressFBWarnings;

import org.chromium.base.library_loader.ProcessInitException;

import org.chromium.base.metrics.RecordHistogram;

import org.chromium.chrome.R;

+import org.chromium.chrome.browser.AppHooks;

import org.chromium.chrome.browser.ChromeApplication;

import org.chromium.chrome.browser.ChromeFeatureList;

import org.chromium.chrome.browser.IntentHandler;

@@ -151,13 +152,13 @@ public class CustomTabsConnection {

/**

* @return The unique instance of ChromeCustomTabsConnection.

+ * TODO(estevenson): Remove Application param.

@SuppressFBWarnings("BC_UNCONFIRMED_CAST")

public static CustomTabsConnection getInstance(Application application) {

if (sInstance.get() == null) {

- ChromeApplication chromeApplication = (ChromeApplication) application;

- chromeApplication.initCommandLine();

- sInstance.compareAndSet(null, chromeApplication.createCustomTabsConnection());

+ ((ChromeApplication) application).initCommandLine();

+ sInstance.compareAndSet(null, AppHooks.get().createCustomTabsConnection());

}

return sInstance.get();

}