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

Unified Diff: chrome/chrome_browser_chromeos.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser_chromeos.gypi
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi
index 96a0b5d03a2a639a852476f83fc59c5ba7ca85ad..a9c6f7d857e6e45b36ebcc30e5eadd83281fabf3 100644
--- a/chrome/chrome_browser_chromeos.gypi
+++ b/chrome/chrome_browser_chromeos.gypi
@@ -22,10 +22,10 @@
},
'dependencies': [
# TODO(tbarzic): Cleanup this list.
- 'app/policy/cloud_policy_codegen.gyp:policy',
'attestation_proto',
- 'browser_extensions',
+ 'app/policy/cloud_policy_codegen.gyp:policy',
'browser/performance_monitor/performance_monitor.gyp:performance_monitor',
+ 'browser_extensions',
'cert_logger_proto',
'chrome_resources.gyp:chrome_extra_resources',
'chrome_resources.gyp:chrome_resources',
@@ -45,12 +45,11 @@
'safe_browsing_report_proto',
'variations_seed_proto',
'../build/linux/system.gyp:dbus',
- '../build/temp_gyp/googleurl.gyp:googleurl',
'../chromeos/chromeos.gyp:chromeos',
'../chromeos/chromeos.gyp:chromeos_memory',
+ '../chromeos/ime/input_method.gyp:gencode',
'../content/content.gyp:content_browser',
'../content/content.gyp:content_common',
- '../chromeos/ime/input_method.gyp:gencode',
'../crypto/crypto.gyp:crypto',
'../dbus/dbus.gyp:dbus',
'../device/bluetooth/bluetooth.gyp:device_bluetooth',
@@ -77,20 +76,22 @@
'../third_party/npapi/npapi.gyp:npapi',
'../third_party/protobuf/protobuf.gyp:protobuf_lite',
'../third_party/protobuf/protobuf.gyp:protoc#host',
- 'chrome_resources.gyp:chrome_strings',
'../third_party/re2/re2.gyp:re2',
'../third_party/zlib/zlib.gyp:zlib',
'../ui/base/strings/ui_strings.gyp:ui_strings',
'../ui/surface/surface.gyp:surface',
'../ui/ui.gyp:ui',
'../ui/ui.gyp:ui_resources',
+ '../ui/views/controls/webview/webview.gyp:webview',
'../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
+ '../url/url.gyp:url_lib',
'../v8/tools/gyp/v8.gyp:v8',
'../ui/views/controls/webview/webview.gyp:webview',
'../webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
'../webkit/support/webkit_support.gyp:glue',
'../webkit/support/webkit_support.gyp:webkit_resources',
'../webkit/support/webkit_support.gyp:webkit_storage',
+ 'chrome_resources.gyp:chrome_strings',
],
'defines': [
'<@(nacl_defines)',
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698