| Index: chrome/android/java/src/org/chromium/chrome/browser/ntp/UiConfig.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/UiConfig.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/UiConfig.java
|
| index 8d3aa5ad38536d36ca92326473cd9f03060ab376..9ed014e7b65faf20228636d999a9f1d9e53a56fa 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/UiConfig.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/UiConfig.java
|
| @@ -9,6 +9,7 @@ import android.support.annotation.IntDef;
|
| import android.view.View;
|
|
|
| import org.chromium.base.Log;
|
| +import org.chromium.base.VisibleForTesting;
|
| import org.chromium.ui.widget.Toast;
|
|
|
| import java.lang.annotation.Retention;
|
| @@ -73,14 +74,23 @@ public class UiConfig {
|
| * Refresh the display style, notify observers of changes.
|
| */
|
| public void updateDisplayStyle() {
|
| - @DisplayStyle
|
| - int newDisplayStyle = computeDisplayStyleForCurrentConfig();
|
| + updateDisplayStyle(computeDisplayStyleForCurrentConfig());
|
| + }
|
| +
|
| + /**
|
| + * Sets the display style, notifying observers of changes. Should only be used in testing.
|
| + */
|
| + @VisibleForTesting
|
| + public void setDisplayStyleForTesting(@DisplayStyle int displayStyle) {
|
| + updateDisplayStyle(displayStyle);
|
| + }
|
|
|
| - if (newDisplayStyle == mCurrentDisplayStyle) return;
|
| + private void updateDisplayStyle(@DisplayStyle int displayStyle) {
|
| + if (displayStyle == mCurrentDisplayStyle) return;
|
|
|
| - mCurrentDisplayStyle = newDisplayStyle;
|
| + mCurrentDisplayStyle = displayStyle;
|
| for (DisplayStyleObserver observer : mObservers) {
|
| - observer.onDisplayStyleChanged(newDisplayStyle);
|
| + observer.onDisplayStyleChanged(displayStyle);
|
| }
|
| }
|
|
|
|
|