Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(748)

Side by Side Diff: chrome/chrome_features.gypi

Issue 2160853002: Set enable_google_now to false (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync to d5293c9 and Resolve Conflicts Created 4 years, 5 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/common/features.gni » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # This is the GYP equivalent of //chrome/common/features.gni. 5 # This is the GYP equivalent of //chrome/common/features.gni.
6 # Please keep in sync! 6 # Please keep in sync!
7 7
8 { 8 {
9 'variables': { 9 'variables': {
10 'variables': { 10 'variables': {
11 # Conditional variables. 11 # Conditional variables.
12 'conditions': [ 12 'conditions': [
13 ['OS=="android"', { 13 ['OS=="android"', {
14 'android_java_ui%': 1, 14 'android_java_ui%': 1,
15 }, { 15 }, {
16 'android_java_ui': 0, 16 'android_java_ui': 0,
17 }], 17 }],
18 ['OS=="android" or OS=="ios"', { 18 ['OS=="android" or OS=="ios"', {
19 'enable_background%': 0, 19 'enable_background%': 0,
20 'enable_google_now%': 0,
21 }, { 20 }, {
22 'enable_background%': 1, 21 'enable_background%': 1,
23 'enable_google_now%': 1,
24 }] 22 }]
25 ], 23 ],
26 24
25 # Google Now is disabled to prepare for its removal.
26 # http://crbug.com/539674
27 'enable_google_now%': 0,
28
27 # Use vulcanized HTML/CSS/JS resources to speed up WebUI (chrome://) 29 # Use vulcanized HTML/CSS/JS resources to speed up WebUI (chrome://)
28 # pages. https://github.com/polymer/vulcanize 30 # pages. https://github.com/polymer/vulcanize
29 'use_vulcanize%': 1, 31 'use_vulcanize%': 1,
30 }, 32 },
31 33
32 # Anything in the conditions needs to be copied to the outer scope to be 34 # Anything in the conditions needs to be copied to the outer scope to be
33 # accessible. 35 # accessible.
34 'enable_background%': '<(enable_background)', 36 'enable_background%': '<(enable_background)',
35 'enable_google_now%': '<(enable_google_now)', 37 'enable_google_now%': '<(enable_google_now)',
36 'android_java_ui%': '<(android_java_ui)', 38 'android_java_ui%': '<(android_java_ui)',
37 'use_vulcanize%': '<(use_vulcanize)', 39 'use_vulcanize%': '<(use_vulcanize)',
38 40
39 # GN only, but defined here so BUILDFLAG works without ifdef. 41 # GN only, but defined here so BUILDFLAG works without ifdef.
40 'enable_package_mash_services%': 0, 42 'enable_package_mash_services%': 0,
41 43
42 # Grit defines based on the feature flags. These must be manually added to 44 # Grit defines based on the feature flags. These must be manually added to
43 # grit targets. 45 # grit targets.
44 'chrome_grit_defines': [ 46 'chrome_grit_defines': [
45 '-D', 'enable_background=<(enable_background)', 47 '-D', 'enable_background=<(enable_background)',
46 '-D', 'enable_google_now=<(enable_google_now)', 48 '-D', 'enable_google_now=<(enable_google_now)',
47 '-D', 'use_vulcanize=<(use_vulcanize)', 49 '-D', 'use_vulcanize=<(use_vulcanize)',
48 ], 50 ],
49 }, 51 },
50 } 52 }
OLDNEW
« no previous file with comments | « no previous file | chrome/common/features.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698