chrome/chrome_browser.gypi - Issue 11293267: Put the pop-up app launcher behind a compile-time flag, and provide defines.

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/chrome_browser.gypi

Issue 11293267: Put the pop-up app launcher behind a compile-time flag, and provide defines. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: unifdef controller from startup, lets us do nicer excludes Created 8 years, 1 month 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

Index: chrome/chrome_browser.gypi

diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi

index af8b6e2f4cbfd2b6fad2d33a58bb16834c0bfbf4..91bde625278cc3744f1dbcfa88f5bfb33e788206 100644

--- a/chrome/chrome_browser.gypi

+++ b/chrome/chrome_browser.gypi

@@ -2747,7 +2747,6 @@

'../google_update/google_update.gyp:google_update',

'../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',

'../third_party/isimpledom/isimpledom.gyp:isimpledom',

- '../ui/app_list/app_list.gyp:app_list',

'../ui/views/controls/webview/webview.gyp:webview',

'../ui/views/views.gyp:views',

@@ -2854,13 +2853,18 @@

'browser/protector/settings_change_global_error_delegate.h',

}],

- [ 'use_openssl==1', {

+ ['use_openssl==1', {

'sources!': [

'browser/importer/nss_decryptor.cc',

'browser/importer/nss_decryptor_system_nss.cc',

'browser/importer/nss_decryptor_system_nss.h',

- ]},

- ],

+ ]

+ }],

+ ['enable_app_list==1', {

+ 'dependencies': [

+ '../ui/app_list/app_list.gyp:app_list',

+ ]

+ }],

'target_conditions': [

# Need 'target_conditions' to override default filename_rules to include

« no previous file with comments | « chrome/browser/ui/startup/startup_browser_creator_impl.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »