| 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 484b358e4ed59d437faf6ca87340d3ed211545b7..869bf0cad290bbdcda8908e319c947342385f541 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
| @@ -624,7 +624,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);
|
| @@ -1210,7 +1210,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;
|
| @@ -1240,7 +1240,7 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode
|
| @Override
|
| protected void initializeToolbar() {
|
| super.initializeToolbar();
|
| - if (DeviceFormFactor.isTablet(getApplicationContext())) {
|
| + if (DeviceFormFactor.isTablet()) {
|
| getToolbarManager().setShouldUpdateToolbarPrimaryColor(false);
|
| }
|
| }
|
| @@ -1900,7 +1900,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;
|
|
|
| // If Chrome Home is enabled, the super of this function is not called because it only
|
| // performs unnecessary transformations on the theme color.
|
|
|