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

Unified Diff: chrome/chrome.gyp

Issue 14617003: Make chrome.exe rendezvous with existing chrome process earlier. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 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/browser/ui/metro_chrome_win.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome.gyp
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index aac5f6cf5e07f8445f104a3785bfab81e146e599..01950c527660166ef078e61921d34f388ceb34cd 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -169,6 +169,7 @@
'chrome_renderer.gypi',
'chrome_tests.gypi',
'nacl.gypi',
+ 'policy.gypi',
'../apps/apps.gypi',
],
'targets': [
@@ -877,7 +878,7 @@
],
},
],
- },], # OS=="linux"
+ }], # OS=="linux"
['OS=="win"',
{ 'targets': [
{
@@ -1049,8 +1050,12 @@
'tools/safe_browsing/sb_sigutil.cc',
],
},
- ]}, # 'targets'
- ], # OS=="win"
+ ], # 'targets'
+ 'includes': [
+ 'chrome_process_finder.gypi',
+ 'metro_utils.gypi',
+ ],
+ }], # OS=="win"
['OS=="win" and target_arch=="ia32"',
{ 'targets': [
{
« no previous file with comments | « chrome/browser/ui/metro_chrome_win.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698