chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java - Issue 2440643002: Remove TabModelSelector's dependency on ChromeFullscreenManager.

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

Issue 2440643002: Remove TabModelSelector's dependency on ChromeFullscreenManager. (Closed)

Patch Set: file move Created 4 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.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/ChromeTabbedActivity.java

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

index e1daa81e0013759fc9bc957674b5804156573007..cc4d5f988a3c528d6a8699d5e3b4b78d3a601414 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java

@@ -991,8 +991,7 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode

int index = savedInstanceState != null ? savedInstanceState.getInt(WINDOW_INDEX, 0) : 0;

mTabModelSelectorImpl = (TabModelSelectorImpl)

- TabWindowManager.getInstance().requestSelector(this, this, getFullscreenManager(),

- index);

+ TabWindowManager.getInstance().requestSelector(this, this, index);

if (mTabModelSelectorImpl == null) {

Toast.makeText(this, getString(R.string.unsupported_number_of_windows),

Toast.LENGTH_LONG).show();

@@ -1658,6 +1657,6 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode

protected ChromeFullscreenManager createFullscreenManager() {

return new ChromeFullscreenManager(this,

(ToolbarControlContainer) findViewById(R.id.control_container),

- getControlContainerHeightResource(), true);

+ getTabModelSelector(), getControlContainerHeightResource(), true);

}