summaryrefslogtreecommitdiffstats
path: root/build/all.gyp
diff options
context:
space:
mode:
authorrsleevi <rsleevi@chromium.org>2014-12-08 13:53:27 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-08 21:54:29 +0000
commit6b150518257d898af57991939f9481bc3e95b5e7 (patch)
tree5ba251ef3a87bdd2b90b4a13c0c8e1b7a1733ada /build/all.gyp
parent629d7c940346b6e707f35d55f7a50e99a650e5c0 (diff)
downloadchromium_src-6b150518257d898af57991939f9481bc3e95b5e7.zip
chromium_src-6b150518257d898af57991939f9481bc3e95b5e7.tar.gz
chromium_src-6b150518257d898af57991939f9481bc3e95b5e7.tar.bz2
Revert of Move TouchSelectionController from content to ui (patchset #12 id:600001 of https://codereview.chromium.org/759433002/)
Reason for revert: Suspected of causing Win8 GN failure http://build.chromium.org/p/chromium.win/builders/Win8%20GN/builds/1552/steps/compile/logs/stdio#error1 FAILED: ninja -t msvc -e environment.x86 -- "C:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64_x86/cl.exe" /nologo /showIncludes /FC @obj/ui/base/dragdrop/ui_base_unittests.os_exchange_data_provider_aurax11_unittest.obj.rsp /c ../../ui/base/dragdrop/os_exchange_data_provider_aurax11_unittest.cc /Foobj/ui/base/dragdrop/ui_base_unittests.os_exchange_data_provider_aurax11_unittest.obj /Fdobj/ui/base/ui_base_unittests_cc.pdb c:\b\build\slave\win8_gn\build\src\ui\base\dragdrop\os_exchange_data_provider_aurax11.h(8) : fatalerror C1083: Cannot open include file: 'X11/Xlib.h': No such file or directory Original issue's description: > Move TouchSelectionController from content to ui > > This patch is only moving new unified touch selection files from > content/ to ui/touch_selection/. This is the first step to allow Aura > use the new unified TouchSelectionController. > > The only change to TouchSelectionController needed for this move is > replacing use of cc::ViewportSelectionBound with ui::SelectionBound. > > The actual use of the new touch selection for Aura will happen in future > CL(s). After that, we can remove current touch selection code from > ui/base/touch/. > > BUG=399721 > > Committed: https://crrev.com/29fd405ca491a6fcf0dde6277d92d44300cb2926 > Cr-Commit-Position: refs/heads/master@{#307336} TBR=jdduke@chromium.org,mfomitchev@chromium.org,sadrul@chromium.org,boliu@chromium.org,jam@chromium.org,mohsen@chromium.org NOTREECHECKS=true NOTRY=true BUG=399721 Review URL: https://codereview.chromium.org/754963007 Cr-Commit-Position: refs/heads/master@{#307344}
Diffstat (limited to 'build/all.gyp')
-rw-r--r--build/all.gyp16
1 files changed, 0 insertions, 16 deletions
diff --git a/build/all.gyp b/build/all.gyp
index 4ab6cfb..9c325fb 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -36,11 +36,6 @@
'../url/url.gyp:*',
],
'conditions': [
- ['OS!="ios" and OS!="mac"', {
- 'dependencies': [
- '../ui/touch_selection/ui_touch_selection.gyp:*',
- ],
- }],
['OS=="ios"', {
'dependencies': [
'../ios/ios.gyp:*',
@@ -317,11 +312,6 @@
'../url/url.gyp:url_unittests',
],
'conditions': [
- ['OS!="ios" and OS!="mac"', {
- 'dependencies': [
- '../ui/touch_selection/ui_touch_selection.gyp:ui_touch_selection_unittests',
- ],
- }],
['OS!="ios" and OS!="android"', {
'dependencies': [
'../cc/blink/cc_blink_tests.gyp:cc_blink_unittests',
@@ -844,7 +834,6 @@
'../tools/android/findbugs_plugin/findbugs_plugin.gyp:findbugs_plugin_test',
'../ui/base/ui_base_tests.gyp:ui_base_unittests',
'../ui/events/events.gyp:events_unittests',
- '../ui/touch_selection/ui_touch_selection.gyp:ui_touch_selection_unittests',
# Unit test bundles packaged as an apk.
'../android_webview/android_webview.gyp:android_webview_test_apk',
'../android_webview/android_webview.gyp:android_webview_unittests_apk',
@@ -873,7 +862,6 @@
'../ui/base/ui_base_tests.gyp:ui_base_unittests_apk',
'../ui/events/events.gyp:events_unittests_apk',
'../ui/gfx/gfx_tests.gyp:gfx_unittests_apk',
- '../ui/touch_selection/ui_touch_selection.gyp:ui_touch_selection_unittests_apk',
],
'conditions': [
['enable_webrtc==1 and "<(libpeer_target_type)"=="static_library"', {
@@ -1087,7 +1075,6 @@
'../ui/base/ui_base_tests.gyp:ui_base_unittests',
'../ui/events/events.gyp:events_unittests',
'../ui/gfx/gfx_tests.gyp:gfx_unittests',
- '../ui/touch_selection/ui_touch_selection.gyp:ui_touch_selection_unittests',
'../ui/views/views.gyp:views_unittests',
'../url/url.gyp:url_unittests',
],
@@ -1192,7 +1179,6 @@
'../ui/events/events.gyp:events_unittests',
'../ui/gfx/gfx_tests.gyp:gfx_unittests',
'../ui/keyboard/keyboard.gyp:keyboard_unittests',
- '../ui/touch_selection/ui_touch_selection.gyp:ui_touch_selection_unittests',
'../url/url.gyp:url_unittests',
],
},
@@ -1233,7 +1219,6 @@
'../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter',
'../ui/base/ui_base_tests.gyp:ui_base_unittests',
'../ui/gfx/gfx_tests.gyp:gfx_unittests',
- '../ui/touch_selection/ui_touch_selection.gyp:ui_touch_selection_unittests',
'../ui/views/views.gyp:views_unittests',
'../url/url.gyp:url_unittests',
],
@@ -1282,7 +1267,6 @@
'../ui/keyboard/keyboard.gyp:*',
'../ui/message_center/message_center.gyp:*',
'../ui/snapshot/snapshot.gyp:snapshot_unittests',
- '../ui/touch_selection/ui_touch_selection.gyp:ui_touch_selection_unittests',
'../ui/views/examples/examples.gyp:views_examples_with_content_exe',
'../ui/views/views.gyp:views',
'../ui/views/views.gyp:views_unittests',