chrome/chrome_browser.gypi - Issue 15421002: Roll DEPS for googleurl. Second try.

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 15421002: Roll DEPS for googleurl. Second try. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: chrome_frame_ie fix 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:

Index: chrome/chrome_browser.gypi

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

index f40b4013a4a53f4d8209a5a233cd06765afd5a15..b16234239d67ec7da5dacf0838e7caa7449e7668 100644

--- a/chrome/chrome_browser.gypi

+++ b/chrome/chrome_browser.gypi

@@ -26,15 +26,14 @@

'safe_browsing_proto',

'safe_browsing_report_proto',

'variations_seed_proto',

- '../build/temp_gyp/googleurl.gyp:googleurl',

'../components/components.gyp:browser_context_keyed_service',

'../components/components.gyp:encryptor',

'../components/components.gyp:sessions',

'../components/components.gyp:user_prefs',

'../components/components.gyp:visitedlink_browser',

'../components/components.gyp:visitedlink_common',

- '../components/components.gyp:webdata_common',

'../components/components.gyp:web_modal',

+ '../components/components.gyp:webdata_common',

'../content/content.gyp:content_browser',

'../content/content.gyp:content_common',

'../crypto/crypto.gyp:crypto',

@@ -51,8 +50,8 @@

'../third_party/libjingle/libjingle.gyp:libjingle',

'../third_party/libxml/libxml.gyp:libxml',

'../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',

- '../third_party/zlib/zlib.gyp:zip',

'../third_party/zlib/zlib.gyp:minizip',

+ '../third_party/zlib/zlib.gyp:zip',

'../third_party/zlib/zlib.gyp:zlib',

'../ui/base/strings/ui_strings.gyp:ui_strings',

'../ui/message_center/message_center.gyp:message_center',

« no previous file with comments | « build/temp_gyp/googleurl.gyp ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »