chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java - Issue 1303613002: Start using the third_party/android_tools target for customtabs library

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/CustomTabActivity.java

Issue 1303613002: Start using the third_party/android_tools target for customtabs library (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 4 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/customtabs/CustomTab.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.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/CustomTabActivity.java

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

index f25528d67e0559f17dfb3798c4fc836a78971639..4c89a0ce41ef048689f3d5e81fe59bd79d30486a 100644

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

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

@@ -7,7 +7,6 @@ package org.chromium.chrome.browser.customtabs;

import android.content.Intent;

import android.net.Uri;

import android.os.IBinder;

-import android.support.customtabs.CustomTabsCallback;

import android.support.customtabs.CustomTabsIntent;

import android.text.TextUtils;

import android.view.MenuItem;

@@ -134,7 +133,7 @@ public class CustomTabActivity extends ChromeActivity {

super.postInflationStartup();

getToolbarManager().setCloseButtonDrawable(mIntentDataProvider.getCloseButtonDrawable());

getToolbarManager().setShowTitle(mIntentDataProvider.getTitleVisibilityState()

- == CustomTabIntentDataProvider.SHOW_PAGE_TITLE);

+ == CustomTabsIntent.SHOW_PAGE_TITLE);

int toolbarColor = mIntentDataProvider.getToolbarColor();

getToolbarManager().updatePrimaryColor(toolbarColor);

if (toolbarColor != getResources().getColor(R.color.default_primary_color)) {

@@ -230,7 +229,7 @@ public class CustomTabActivity extends ChromeActivity {

public void onPauseWithNative() {

super.onPauseWithNative();

CustomTabsConnection.getInstance(getApplication()).notifyNavigationEvent(

- mSession, CustomTabsCallback.TAB_HIDDEN);

+ mSession, CustomTab.TAB_HIDDEN);

}

@Override