chrome/android/java_staging/src/org/chromium/chrome/browser/ntp/NewTabPageView.java - Issue 1155113004: Merge ApplicationSwitches.java and ChromeSwitches.java

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_staging/src/org/chromium/chrome/browser/ntp/NewTabPageView.java

Issue 1155113004: Merge ApplicationSwitches.java and ChromeSwitches.java (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 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

« chrome/android/java/src/org/chromium/chrome/browser/ChromeSwitches.java ('K') | « chrome/android/java_staging/src/org/chromium/chrome/browser/dom_distiller/ReaderModeManager.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java_staging/src/org/chromium/chrome/browser/ntp/NewTabPageView.java

diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/ntp/NewTabPageView.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/ntp/NewTabPageView.java

index 97c663e07986719dd71cb0b0c4e8ee5553b75a0e..ba0d337cc280a464544bf99a9af474449b1f6f1c 100644

--- a/chrome/android/java_staging/src/org/chromium/chrome/browser/ntp/NewTabPageView.java

+++ b/chrome/android/java_staging/src/org/chromium/chrome/browser/ntp/NewTabPageView.java

@@ -38,7 +38,7 @@ import org.chromium.base.CommandLine;

import org.chromium.base.FieldTrialList;

import org.chromium.base.VisibleForTesting;

import org.chromium.base.metrics.RecordHistogram;

-import org.chromium.chrome.browser.ApplicationSwitches;

+import org.chromium.chrome.browser.ChromeSwitches;

import org.chromium.chrome.browser.LogoBridge.Logo;

import org.chromium.chrome.browser.LogoBridge.LogoObserver;

import org.chromium.chrome.browser.favicon.FaviconHelper.FaviconImageCallback;

@@ -210,8 +210,8 @@ public class NewTabPageView extends FrameLayout

// Query the field trial state first, to ensure that UMA reports the correct group.

String fieldTrialGroup = FieldTrialList.findFullName(ICON_NTP_FIELD_TRIAL_NAME);

CommandLine commandLine = CommandLine.getInstance();

- if (commandLine.hasSwitch(ApplicationSwitches.DISABLE_ICON_NTP)) return false;

- if (commandLine.hasSwitch(ApplicationSwitches.ENABLE_ICON_NTP)) return true;

+ if (commandLine.hasSwitch(ChromeSwitches.DISABLE_ICON_NTP)) return false;

+ if (commandLine.hasSwitch(ChromeSwitches.ENABLE_ICON_NTP)) return true;

return fieldTrialGroup.equals(ICON_NTP_ENABLED_GROUP);

}