chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java - Issue 2847523002: Android: Remove GetApplicationContext part 4

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 2847523002: Android: Remove GetApplicationContext part 4 (Closed)

Patch Set: Fix test. Created 3 years, 7 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/ItemChooserDialog.java » ('j') | device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothDevice.java » ('J')
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 9e158aec5b14990d7defbe6b4af66ebb167c2c86..db9d0925ce685400bef5636fbfb430e9c62cfbc0 100644

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

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

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

TraceEvent.begin("ChromeTabbedActivity.initializeUI");

CompositorViewHolder compositorViewHolder = getCompositorViewHolder();

- if (DeviceFormFactor.isTablet(this)) {

+ if (DeviceFormFactor.isTablet()) {

mLayoutManager = new LayoutManagerChromeTablet(compositorViewHolder);

} else {

mLayoutManager = new LayoutManagerChromePhone(compositorViewHolder);

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

@Override

protected int getToolbarLayoutId() {

- if (DeviceFormFactor.isTablet(getApplicationContext())) return R.layout.toolbar_tablet;

+ if (DeviceFormFactor.isTablet()) return R.layout.toolbar_tablet;

if (FeatureUtilities.isChromeHomeEnabled()) return R.layout.bottom_toolbar_phone;

return R.layout.toolbar_phone;

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

@Override

protected void initializeToolbar() {

super.initializeToolbar();

- if (DeviceFormFactor.isTablet(getApplicationContext())) {

+ if (DeviceFormFactor.isTablet()) {

getToolbarManager().setShouldUpdateToolbarPrimaryColor(false);

}

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

@Override

protected void setStatusBarColor(Tab tab, int color) {

- if (DeviceFormFactor.isTablet(getApplicationContext())) return;

+ if (DeviceFormFactor.isTablet()) return;

super.setStatusBarColor(tab, isInOverviewMode() ? Color.BLACK : color);

}