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

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
Index: chrome/chrome.gyp
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 7487ae09596f517f469ed445c1890f0d87d07b2a..dff49c4bcfb9262a9158c85095adb8c272757eb7 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -156,6 +156,7 @@
'chrome_common.gypi',
'chrome_installer_util.gypi',
'chrome_tests_unit.gypi',
+ 'policy.gypi',
grt (UTC plus 2) 2013/05/14 13:49:32 i think this belongs in the OS!="ios" section belo
koz (OOO until 15th September) 2013/05/15 03:31:36 Done.
'version.gypi',
],
'conditions': [
@@ -877,7 +878,7 @@
],
},
],
- },], # OS=="linux"
+ }], # OS=="linux"
['OS=="win"',
{ 'targets': [
{
@@ -1049,8 +1050,11 @@
'tools/safe_browsing/sb_sigutil.cc',
],
},
- ]}, # 'targets'
- ], # OS=="win"
+ ], # 'targets'
+ 'includes': [
+ 'browser/metro_utils/metro_utils.gypi',
+ ],
+ }], # OS=="win"
['OS=="win" and target_arch=="ia32"',
{ 'targets': [
{

Powered by Google App Engine
This is Rietveld 408576698