summaryrefslogtreecommitdiffstats
path: root/win8/metro_driver
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-03 05:40:29 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-03 05:40:29 +0000
commit002cc08fc2472a54222729082f0be64da4212495 (patch)
tree2d4db929a2801368177f2ea1ac42f2873858f909 /win8/metro_driver
parent67e264aed134194e895af888f469ec869f20df99 (diff)
downloadchromium_src-002cc08fc2472a54222729082f0be64da4212495.zip
chromium_src-002cc08fc2472a54222729082f0be64da4212495.tar.gz
chromium_src-002cc08fc2472a54222729082f0be64da4212495.tar.bz2
Roll DEPS for googleurl. Second try.
- Update all the references from build/temp_gyp/googleurl.gyp to url/url.gyp. r184: Fix C++11 compilation on iOS r185: Forward includes to url/ BUG=229660 R=thestig@chromium.org,brettw@chromium.org TBR=darin@chromium.org Review URL: https://chromiumcodereview.appspot.com/15421002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203672 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'win8/metro_driver')
-rw-r--r--win8/metro_driver/metro_driver.gyp12
1 files changed, 6 insertions, 6 deletions
diff --git a/win8/metro_driver/metro_driver.gyp b/win8/metro_driver/metro_driver.gyp
index 623b000..bad7c79 100644
--- a/win8/metro_driver/metro_driver.gyp
+++ b/win8/metro_driver/metro_driver.gyp
@@ -52,13 +52,13 @@
'type': 'shared_library',
'dependencies': [
'../../base/base.gyp:base',
- '../../build/temp_gyp/googleurl.gyp:googleurl',
'../../chrome/common_constants.gyp:common_constants',
'../../crypto/crypto.gyp:crypto',
'../../google_update/google_update.gyp:google_update',
'../../ipc/ipc.gyp:ipc',
'../../sandbox/sandbox.gyp:sandbox',
'../../ui/metro_viewer/metro_viewer.gyp:metro_viewer_messages',
+ '../../url/url.gyp:url_lib',
'../win8.gyp:check_sdk_patch',
'metro_driver_version_resources',
],
@@ -77,8 +77,8 @@
'chrome_app_view_ash.h',
'direct3d_helper.cc',
'direct3d_helper.h',
- 'file_picker_ash.h',
'file_picker_ash.cc',
+ 'file_picker_ash.h',
],
}, { # use_aura!=1
'sources': [
@@ -90,16 +90,16 @@
'../delegate_execute/chrome_util.h',
'devices_handler.cc',
'devices_handler.h',
- 'file_picker.h',
'file_picker.cc',
+ 'file_picker.h',
'metro_dialog_box.cc',
'metro_dialog_box.h',
- 'print_handler.cc',
- 'print_handler.h',
'print_document_source.cc',
'print_document_source.h',
- 'secondary_tile.h',
+ 'print_handler.cc',
+ 'print_handler.h',
'secondary_tile.cc',
+ 'secondary_tile.h',
'settings_handler.cc',
'settings_handler.h',
'toast_notification_handler.cc',