Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(543)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java

Issue 2847523002: Android: Remove GetApplicationContext part 4 (Closed)
Patch Set: Rebase and fix build 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
Index: chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
index 1ed871d536b3e2962d33c7c83c012460ff55db0e..c5c3ff2e02dff4890dc0d398d002bfd3e9cf8911 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
@@ -445,7 +445,7 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe
if (visible) RecordUserAction.record("MobileActionBarShown");
ActionBar actionBar = mActionBarDelegate.getSupportActionBar();
if (!visible && actionBar != null) actionBar.hide();
- if (DeviceFormFactor.isTablet(activity)) {
+ if (DeviceFormFactor.isTablet()) {
if (visible) {
mActionModeController.startShowAnimation();
} else {
@@ -514,8 +514,7 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe
}
// TODO(shaktisahu): Find out if the download menu button is enabled (crbug/712438).
- if (!(activity instanceof ChromeTabbedActivity)
- || DeviceFormFactor.isTablet(mToolbar.getContext())
+ if (!(activity instanceof ChromeTabbedActivity) || DeviceFormFactor.isTablet()
|| activity.isInOverviewMode()
|| !DownloadUtils.isAllowedToDownloadPage(tab)) {
return;
@@ -552,8 +551,7 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe
}
private void handleIPHForErrorPageShown(Tab tab) {
- if (!(activity instanceof ChromeTabbedActivity)
- || DeviceFormFactor.isTablet(mToolbar.getContext())) {
+ if (!(activity instanceof ChromeTabbedActivity) || DeviceFormFactor.isTablet()) {
return;
}
@@ -1326,7 +1324,7 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe
}
Context context = mToolbar.getContext();
- return DeviceFormFactor.isTablet(context)
+ return DeviceFormFactor.isTablet()
&& context.getResources().getConfiguration().keyboard
== Configuration.KEYBOARD_QWERTY;
}

Powered by Google App Engine
This is Rietveld 408576698