trunk/src/ui/views/views.gyp - Issue 14028012: Revert 193968 "Roll the DEPS for google-url."

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: trunk/src/ui/views/views.gyp

Issue 14028012: Revert 193968 "Roll the DEPS for google-url." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 7 years, 8 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: trunk/src/ui/views/views.gyp

===================================================================

--- trunk/src/ui/views/views.gyp (revision 193982)

+++ trunk/src/ui/views/views.gyp (working copy)

@@ -24,10 +24,10 @@

'../../base/base.gyp:base',

'../../base/base.gyp:base_i18n',

'../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',

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

'../../skia/skia.gyp:skia',

'../../third_party/icu/icu.gyp:icui18n',

'../../third_party/icu/icu.gyp:icuuc',

- '../../url/url.gyp:url',

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

'../compositor/compositor.gyp:compositor',

'../native_theme/native_theme.gyp:native_theme',

@@ -648,12 +648,12 @@

# factored out. (for some reason it pulls in a bunch

# unrelated things like v8, sqlite nss...).

'../../chrome/chrome_resources.gyp:packed_resources',

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

'../../skia/skia.gyp:skia',

'../../testing/gmock.gyp:gmock',

'../../testing/gtest.gyp:gtest',

'../../third_party/icu/icu.gyp:icui18n',

'../../third_party/icu/icu.gyp:icuuc',

- '../../url/url.gyp:url',

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

'../compositor/compositor.gyp:compositor',

'../compositor/compositor.gyp:compositor_test_support',

@@ -862,12 +862,12 @@

'dependencies': [

'../../base/base.gyp:base',

'../../base/base.gyp:base_i18n',

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

'../../chrome/chrome_resources.gyp:packed_resources',

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

'../../skia/skia.gyp:skia',

'../../third_party/icu/icu.gyp:icui18n',

'../../third_party/icu/icu.gyp:icuuc',

- '../../url/url.gyp:url',

'../ui.gyp:ui',

'../ui.gyp:ui_resources',

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

« no previous file with comments | « trunk/src/ui/views/controls/webview/webview.gyp ('k') | trunk/src/url/url.gyp » ('j') | no next file with comments »