| Index: chrome/android/java/src/org/chromium/chrome/browser/page_info/PageInfoPopup.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/page_info/PageInfoPopup.java b/chrome/android/java/src/org/chromium/chrome/browser/page_info/PageInfoPopup.java
|
| index 953715cb5b9df4f612df7313c83e5dc0bcdd929d..29e33ec9d5b8d516091256cfc4371f80122bbf18 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/page_info/PageInfoPopup.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/page_info/PageInfoPopup.java
|
| @@ -433,7 +433,7 @@ public class PageInfoPopup implements OnClickListener {
|
|
|
| @Override
|
| public void dismiss() {
|
| - if (DeviceFormFactor.isTablet(mContext) || mDismissWithoutAnimation) {
|
| + if (DeviceFormFactor.isTablet() || mDismissWithoutAnimation) {
|
| // Dismiss the dialog without any custom animations on tablet.
|
| super.dismiss();
|
| } else {
|
| @@ -460,7 +460,7 @@ public class PageInfoPopup implements OnClickListener {
|
| mDialog.setCanceledOnTouchOutside(true);
|
|
|
| // On smaller screens, place the dialog at the top of the screen, and remove its border.
|
| - if (!DeviceFormFactor.isTablet(mContext)) {
|
| + if (!DeviceFormFactor.isTablet()) {
|
| Window window = mDialog.getWindow();
|
| window.setGravity(Gravity.TOP);
|
| window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
|
| @@ -712,7 +712,7 @@ public class PageInfoPopup implements OnClickListener {
|
| * Displays the PageInfoPopup.
|
| */
|
| private void showDialog() {
|
| - if (!DeviceFormFactor.isTablet(mContext)) {
|
| + if (!DeviceFormFactor.isTablet()) {
|
| // On smaller screens, make the dialog fill the width of the screen.
|
| ScrollView scrollView = new ScrollView(mContext) {
|
| @Override
|
| @@ -768,7 +768,7 @@ public class PageInfoPopup implements OnClickListener {
|
| */
|
| private void runAfterDismiss(Runnable task) {
|
| mDialog.dismiss();
|
| - if (DeviceFormFactor.isTablet(mContext)) {
|
| + if (DeviceFormFactor.isTablet()) {
|
| task.run();
|
| } else {
|
| mContainer.postDelayed(task, FADE_DURATION + CLOSE_CLEANUP_DELAY);
|
| @@ -938,7 +938,7 @@ public class PageInfoPopup implements OnClickListener {
|
| AnimatorSet.Builder builder = null;
|
| Animator startAnim;
|
|
|
| - if (DeviceFormFactor.isTablet(mContext)) {
|
| + if (DeviceFormFactor.isTablet()) {
|
| // The start time of the entire AnimatorSet is the start time of the first animation
|
| // added to the Builder. We use a blank AnimatorSet on tablet as an easy way to
|
| // co-ordinate this start time.
|
|
|