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

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

Patch Set: Rebase. 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 | « chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/ntp/NtpColorUtils.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 4979f868d5b8406192058a8256d0a098d6902ed1..95795e3e097f5abf02423dd8d52f99ee57c52f23 100644

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

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

@@ -12,7 +12,6 @@

import org.chromium.base.ApiCompatibilityUtils;

import org.chromium.chrome.R;

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

/**

* Layout for the new tab page. This positions the page elements in the correct vertical positions.

@@ -173,8 +172,7 @@ private int calculateTopOfMostVisited() {

* material design is enabled.

private void setSearchBoxStyle() {

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

- || ChromeFeatureList.isEnabled(ChromeFeatureList.NTP_MATERIAL_DESIGN))

+ if (NtpColorUtils.shouldUseMaterialColors()

&& ApiCompatibilityUtils.setElevation(mSearchBoxView,

getResources().getDimensionPixelSize(R.dimen.toolbar_elevation))) {

// Replace drawable with one that does not contain a border.