chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java - Issue 1997473004: Snippets are enabled when search suggestions are enabled.

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

Issue 1997473004: Snippets are enabled when search suggestions are enabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix ios. Created 4 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

« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java » ('j') | chrome/android/java/src/org/chromium/chrome/browser/ntp/NtpColorUtils.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index d3a0a44ff0369c398990e8109cac532a2e04eb96..c39626e4227f3e8f6eff301ac03c68d67b30f6e9 100644

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

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

@@ -51,6 +51,7 @@

import org.chromium.chrome.browser.ntp.snippets.SnippetArticle;

import org.chromium.chrome.browser.ntp.snippets.SnippetsBridge;

import org.chromium.chrome.browser.ntp.snippets.SnippetsBridge.SnippetsObserver;

+import org.chromium.chrome.browser.ntp.snippets.SnippetsConfig;

import org.chromium.chrome.browser.offlinepages.OfflinePageBridge;

import org.chromium.chrome.browser.preferences.PrefServiceBridge;

import org.chromium.chrome.browser.profiles.MostVisitedSites;

@@ -258,7 +259,7 @@ public boolean isInterestsEnabled() {

@Override

public boolean isToolbarEnabled() {

return ChromeFeatureList.isEnabled(ChromeFeatureList.NTP_TOOLBAR)

- && !ChromeFeatureList.isEnabled(ChromeFeatureList.NTP_SNIPPETS);

+ && !SnippetsConfig.isEnabled();

}

@Override

@@ -636,7 +637,7 @@ public void onHidden(Tab tab) {

mLogoBridge = new LogoBridge(mProfile);

updateSearchProviderHasLogo();

- if (ChromeFeatureList.isEnabled(ChromeFeatureList.NTP_SNIPPETS)) {

+ if (SnippetsConfig.isEnabled()) {

mSnippetsBridge = new SnippetsBridge(mProfile);

}