diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-13 10:20:37 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-13 10:20:37 +0000 |
| commit | ed8fd9152e0dff6c26f69f968e0d4aa4bd890d57 (patch) | |
| tree | 163fe12566ebad286d91d12820f078b240e2db26 | |
| parent | 4795329fcd7308914fcdbee6f824c250cfae2629 (diff) | |
| download | chromium_src-ed8fd9152e0dff6c26f69f968e0d4aa4bd890d57.zip chromium_src-ed8fd9152e0dff6c26f69f968e0d4aa4bd890d57.tar.gz chromium_src-ed8fd9152e0dff6c26f69f968e0d4aa4bd890d57.tar.bz2 | |
Move ui.gyp into ui/base/ directory.
This follows the rule we setup for //ui which states that each subdir
should be its own component with its own gyp file that lives in its
subdir.
The 'ui' target was renamed to ui_base to match the convention.
BUG=299841
TEST=gyp files.
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/198333004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256788 0039d316-1c4b-4281-b951-d872f2087c98
53 files changed, 750 insertions, 751 deletions
diff --git a/android_webview/android_webview_tests.gypi b/android_webview/android_webview_tests.gypi index f2be536..18fcbe1 100644 --- a/android_webview/android_webview_tests.gypi +++ b/android_webview/android_webview_tests.gypi @@ -86,7 +86,7 @@ '../testing/android/native_test.gyp:native_test_native_code', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', - '../ui/ui.gyp:ui_base_jni_headers', + '../ui/base/ui_base.gyp:ui_base_jni_headers', 'android_webview_common', 'android_webview_unittests_jni', ], diff --git a/android_webview/native/webview_native.gyp b/android_webview/native/webview_native.gyp index a6269a1..27d599a 100644 --- a/android_webview/native/webview_native.gyp +++ b/android_webview/native/webview_native.gyp @@ -18,9 +18,9 @@ '../../content/content.gyp:content_common', '../../net/net.gyp:net', '../../skia/skia.gyp:skia', + '../../ui/base/ui_base.gyp:ui_base', '../../ui/gfx/gfx.gyp:gfx', '../../ui/gfx/gfx.gyp:gfx_geometry', - '../../ui/ui.gyp:ui', '../../webkit/common/webkit_common.gyp:webkit_common', '../../webkit/storage_browser.gyp:webkit_storage_browser', '../../webkit/storage_common.gyp:webkit_storage_common', diff --git a/ash/ash.gyp b/ash/ash.gyp index 96ba4d7..7c3fb5b 100644 --- a/ash/ash.gyp +++ b/ash/ash.gyp @@ -28,6 +28,7 @@ '../ui/app_list/app_list.gyp:app_list', '../ui/aura/aura.gyp:aura', '../ui/base/strings/ui_strings.gyp:ui_strings', + '../ui/base/ui_base.gyp:ui_base', '../ui/compositor/compositor.gyp:compositor', '../ui/events/events.gyp:events', '../ui/gfx/gfx.gyp:gfx', @@ -35,7 +36,6 @@ '../ui/keyboard/keyboard.gyp:keyboard', '../ui/message_center/message_center.gyp:message_center', '../ui/resources/ui_resources.gyp:ui_resources', - '../ui/ui.gyp:ui', '../ui/views/controls/webview/webview.gyp:webview', '../ui/views/views.gyp:views', '../ui/web_dialogs/web_dialogs.gyp:web_dialogs', @@ -698,12 +698,12 @@ '../skia/skia.gyp:skia', '../ui/aura/aura.gyp:aura', '../ui/base/strings/ui_strings.gyp:ui_strings', + '../ui/base/ui_base.gyp:ui_base', '../ui/compositor/compositor.gyp:compositor', '../ui/events/events.gyp:events', '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', '../ui/resources/ui_resources.gyp:ui_resources', - '../ui/ui.gyp:ui', '../ui/views/controls/webview/webview.gyp:webview', '../ui/views/views.gyp:views', '../ui/web_dialogs/web_dialogs.gyp:web_dialogs', @@ -821,6 +821,7 @@ '../ui/app_list/app_list.gyp:app_list', '../ui/aura/aura.gyp:aura', '../ui/aura/aura.gyp:aura_test_support', + '../ui/base/ui_base.gyp:ui_base', '../ui/compositor/compositor.gyp:compositor', '../ui/compositor/compositor.gyp:compositor_test_support', '../ui/events/events.gyp:events', @@ -831,7 +832,6 @@ '../ui/message_center/message_center.gyp:message_center', '../ui/message_center/message_center.gyp:message_center_test_support', '../ui/resources/ui_resources.gyp:ui_resources', - '../ui/ui.gyp:ui', '../ui/ui_unittests.gyp:ui_test_support', '../ui/views/views.gyp:views', '../ui/views/views.gyp:views_examples_with_content_lib', @@ -1055,6 +1055,7 @@ '../third_party/icu/icu.gyp:icuuc', '../ui/app_list/app_list.gyp:app_list', '../ui/aura/aura.gyp:aura', + '../ui/base/ui_base.gyp:ui_base', '../ui/compositor/compositor.gyp:compositor', '../ui/events/events.gyp:events', '../ui/gfx/gfx.gyp:gfx', @@ -1062,7 +1063,6 @@ '../ui/keyboard/keyboard.gyp:keyboard', '../ui/message_center/message_center.gyp:message_center', '../ui/resources/ui_resources.gyp:ui_resources', - '../ui/ui.gyp:ui', '../ui/views/views.gyp:views', '../ui/views/views.gyp:views_examples_lib', '../ui/views/views.gyp:views_examples_with_content_lib', diff --git a/build/all.gyp b/build/all.gyp index 9a07c4f..12a2202 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -30,8 +30,8 @@ '../third_party/sqlite/sqlite.gyp:*', '../third_party/zlib/zlib.gyp:*', '../ui/accessibility/accessibility.gyp:*', + '../ui/base/ui_base.gyp:*', '../ui/snapshot/snapshot.gyp:*', - '../ui/ui.gyp:*', '../url/url.gyp:*', ], 'conditions': [ diff --git a/chrome/browser/ui/libgtk2ui/libgtk2ui.gyp b/chrome/browser/ui/libgtk2ui/libgtk2ui.gyp index 17f9b4a..453c380 100644 --- a/chrome/browser/ui/libgtk2ui/libgtk2ui.gyp +++ b/chrome/browser/ui/libgtk2ui/libgtk2ui.gyp @@ -20,8 +20,8 @@ '../../../../printing/printing.gyp:cups', '../../../../skia/skia.gyp:skia', '../../../../ui/base/strings/ui_strings.gyp:ui_strings', + '../../../../ui/base/ui_base.gyp:ui_base', '../../../../ui/resources/ui_resources.gyp:ui_resources', - '../../../../ui/ui.gyp:ui', '../../../../ui/views/views.gyp:views', '../../../chrome_resources.gyp:chrome_extra_resources', '../../../chrome_resources.gyp:chrome_resources', diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index e0fe4db0..736dc48 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -697,9 +697,9 @@ 'dependencies': [ 'chrome_resources.gyp:chrome_strings', '../base/base.gyp:base', + '../ui/base/ui_base.gyp:ui_base', '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', - '../ui/ui.gyp:ui', ], 'include_dirs': [ '<(grit_out_dir)', diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 47a0f2b..6eec3fc 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -77,13 +77,13 @@ '../third_party/zlib/zlib.gyp:minizip', '../third_party/zlib/zlib.gyp:zlib', '../ui/base/strings/ui_strings.gyp:ui_strings', + '../ui/base/ui_base.gyp:ui_base', '../ui/events/events.gyp:events_base', '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', '../ui/message_center/message_center.gyp:message_center', '../ui/resources/ui_resources.gyp:ui_resources', '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs', - '../ui/ui.gyp:ui', ], 'include_dirs': [ '..', diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi index 47859aa..8dcb4f5 100644 --- a/chrome/chrome_browser_chromeos.gypi +++ b/chrome/chrome_browser_chromeos.gypi @@ -85,10 +85,10 @@ '../third_party/protobuf/protobuf.gyp:protoc#host', '../third_party/zlib/zlib.gyp:zlib', '../ui/base/strings/ui_strings.gyp:ui_strings', + '../ui/base/ui_base.gyp:ui_base', '../ui/events/events.gyp:dom4_keycode_converter', '../ui/resources/ui_resources.gyp:ui_resources', '../ui/surface/surface.gyp:surface', - '../ui/ui.gyp:ui', '../ui/views/controls/webview/webview.gyp:webview', '../ui/views/controls/webview/webview.gyp:webview', '../ui/web_dialogs/web_dialogs.gyp:web_dialogs', diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi index 3a45049..b6d1e9b 100644 --- a/chrome/chrome_browser_extensions.gypi +++ b/chrome/chrome_browser_extensions.gypi @@ -51,10 +51,10 @@ '../third_party/webrtc/modules/modules.gyp:desktop_capture', '../ui/accessibility/accessibility.gyp:ax_gen', '../ui/base/strings/ui_strings.gyp:ui_strings', + '../ui/base/ui_base.gyp:ui_base', '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', '../ui/resources/ui_resources.gyp:ui_resources', - '../ui/ui.gyp:ui', '../url/url.gyp:url_lib', '../webkit/storage_browser.gyp:webkit_storage_browser', '../webkit/storage_common.gyp:webkit_storage_common', diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi index d9c92a2..49105b8 100644 --- a/chrome/chrome_browser_ui.gypi +++ b/chrome/chrome_browser_ui.gypi @@ -50,6 +50,7 @@ '../third_party/zlib/zlib.gyp:zlib', '../ui/accessibility/accessibility.gyp:accessibility', '../ui/base/strings/ui_strings.gyp:ui_strings', + '../ui/base/ui_base.gyp:ui_base', '../ui/events/events.gyp:events', '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', @@ -57,7 +58,6 @@ '../ui/native_theme/native_theme.gyp:native_theme', '../ui/resources/ui_resources.gyp:ui_resources', '../ui/snapshot/snapshot.gyp:snapshot', - '../ui/ui.gyp:ui', ], 'include_dirs': [ '..', diff --git a/chrome/chrome_browser_ui_views.gyp b/chrome/chrome_browser_ui_views.gyp index 94365d2..c36344a 100644 --- a/chrome/chrome_browser_ui_views.gyp +++ b/chrome/chrome_browser_ui_views.gyp @@ -13,10 +13,10 @@ 'dependencies': [ '../base/base.gyp:base', '../skia/skia.gyp:skia', + '../ui/base/ui_base.gyp:ui_base', '../ui/events/events.gyp:events', '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', - '../ui/ui.gyp:ui', '../url/url.gyp:url_lib', ], 'conditions': [ diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 73117d9..23d5f47 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -493,9 +493,9 @@ '../third_party/zlib/zlib.gyp:minizip', '../third_party/zlib/zlib.gyp:zlib', '../ui/accessibility/accessibility.gyp:ax_gen', + '../ui/base/ui_base.gyp:ui_base', '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', - '../ui/ui.gyp:ui', '../url/url.gyp:url_lib', ], 'include_dirs': [ @@ -683,10 +683,10 @@ '../crypto/crypto.gyp:crypto', '../net/net.gyp:http_server', '../net/net.gyp:net', + '../ui/base/ui_base.gyp:ui_base', '../ui/events/events.gyp:events_base', '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', - '../ui/ui.gyp:ui', ], 'include_dirs': [ '..', @@ -795,9 +795,9 @@ '../net/net.gyp:http_server', '../net/net.gyp:net', '../testing/gtest.gyp:gtest', + '../ui/base/ui_base.gyp:ui_base', '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', - '../ui/ui.gyp:ui', ], 'include_dirs': [ '..,' @@ -907,14 +907,14 @@ '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation', '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', + '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput', '../third_party/libjingle/libjingle.gyp:peerconnection_server', - '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', '../third_party/safe_browsing/safe_browsing.gyp:safe_browsing', '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h', + '../ui/base/ui_base.gyp:webui_test_support', '../ui/compositor/compositor.gyp:compositor_test_support', '../ui/web_dialogs/web_dialogs.gyp:web_dialogs_test_support', - '../ui/ui.gyp:webui_test_support', '../v8/tools/gyp/v8.gyp:v8', # Runtime dependencies '../ppapi/ppapi_internal.gyp:ppapi_tests', diff --git a/components/autofill.gypi b/components/autofill.gypi index a190d6c..61496b5 100644 --- a/components/autofill.gypi +++ b/components/autofill.gypi @@ -28,8 +28,8 @@ 'type': 'static_library', 'dependencies': [ '../base/base.gyp:base', + '../ui/base/ui_base.gyp:ui_base', '../ui/gfx/gfx.gyp:gfx', - '../ui/ui.gyp:ui', '../url/url.gyp:url_lib', ], 'conditions': [ @@ -96,8 +96,8 @@ '../third_party/icu/icu.gyp:icuuc', '../third_party/libjingle/libjingle.gyp:libjingle', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber', + '../ui/base/ui_base.gyp:ui_base', '../ui/gfx/gfx.gyp:gfx', - '../ui/ui.gyp:ui', '../url/url.gyp:url_lib', 'autofill_core_common', 'autofill_regexes', @@ -338,9 +338,9 @@ '../third_party/icu/icu.gyp:icuuc', '../third_party/libjingle/libjingle.gyp:libjingle', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber', + '../ui/base/ui_base.gyp:ui_base', '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', - '../ui/ui.gyp:ui', '../url/url.gyp:url_lib', 'autofill_content_common', 'autofill_content_risk_proto', diff --git a/components/components_tests.gyp b/components/components_tests.gyp index 90d81be..0498bf6a 100644 --- a/components/components_tests.gyp +++ b/components/components_tests.gyp @@ -143,8 +143,8 @@ '../sync/sync.gyp:test_support_sync_api', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', + '../ui/base/ui_base.gyp:ui_base', '../ui/gfx/gfx.gyp:gfx', - '../ui/ui.gyp:ui', 'component_resources.gyp:component_resources', diff --git a/components/policy/policy_browser.gypi b/components/policy/policy_browser.gypi index 6b91f2b..3eecf16 100644 --- a/components/policy/policy_browser.gypi +++ b/components/policy/policy_browser.gypi @@ -8,7 +8,7 @@ '../base/base.gyp:base_prefs', '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../net/net.gyp:net', - '../ui/ui.gyp:ui', + '../ui/base/ui_base.gyp:ui_base', '../url/url.gyp:url_lib', 'component_strings.gyp:component_strings', 'user_prefs', diff --git a/components/translate.gypi b/components/translate.gypi index 6382c7a..07238f62 100644 --- a/components/translate.gypi +++ b/components/translate.gypi @@ -8,15 +8,15 @@ 'target_name': 'translate_core_browser', 'type': 'static_library', 'dependencies': [ - 'component_resources.gyp:component_resources', - 'language_usage_metrics', - 'translate_core_common', - 'user_prefs', '../base/base.gyp:base', '../google_apis/google_apis.gyp:google_apis', '../net/net.gyp:net', + '../ui/base/ui_base.gyp:ui_base', '../url/url.gyp:url_lib', - '../ui/ui.gyp:ui', + 'component_resources.gyp:component_resources', + 'language_usage_metrics', + 'translate_core_common', + 'user_prefs', ], 'include_dirs': [ '..', diff --git a/components/user_prefs.gypi b/components/user_prefs.gypi index a556e70..a5c62ac 100644 --- a/components/user_prefs.gypi +++ b/components/user_prefs.gypi @@ -12,7 +12,7 @@ '../base/base.gyp:base_prefs', '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../content/content.gyp:content_browser', - '../ui/ui.gyp:ui', + '../ui/base/ui_base.gyp:ui_base', ], 'include_dirs': [ '..', diff --git a/components/web_contents_delegate_android.gypi b/components/web_contents_delegate_android.gypi index 5506338..f0c8c94 100644 --- a/components/web_contents_delegate_android.gypi +++ b/components/web_contents_delegate_android.gypi @@ -16,9 +16,9 @@ '../content/content.gyp:content_common', '../net/net.gyp:net', '../skia/skia.gyp:skia', + '../ui/base/ui_base.gyp:ui_base', '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', - '../ui/ui.gyp:ui', 'web_contents_delegate_android_jni_headers', ], 'include_dirs': [ diff --git a/content/content_app.gypi b/content/content_app.gypi index b022e3f..4908175 100644 --- a/content/content_app.gypi +++ b/content/content_app.gypi @@ -10,9 +10,9 @@ '../base/base.gyp:base', '../base/base.gyp:base_i18n', '../crypto/crypto.gyp:crypto', + '../ui/base/ui_base.gyp:ui_base', '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', - '../ui/ui.gyp:ui', ], 'sources': [ 'app/android/app_jni_registrar.cc', diff --git a/content/content_browser.gypi b/content/content_browser.gypi index e8aa6b1..eaa27c3 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -4,24 +4,24 @@ { 'dependencies': [ - '../third_party/re2/re2.gyp:re2', '../base/base.gyp:base_static', '../crypto/crypto.gyp:crypto', '../google_apis/google_apis.gyp:google_apis', '../net/net.gyp:net', '../skia/skia.gyp:skia', '../sql/sql.gyp:sql', + '../third_party/re2/re2.gyp:re2', '../third_party/zlib/google/zip.gyp:zip', '../third_party/zlib/zlib.gyp:zlib', '../ui/accessibility/accessibility.gyp:accessibility', '../ui/accessibility/accessibility.gyp:ax_gen', + '../ui/base/ui_base.gyp:ui_base', '../ui/events/events.gyp:events_base', '../ui/events/events.gyp:gesture_detection', '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', '../ui/resources/ui_resources.gyp:ui_resources', '../ui/snapshot/snapshot.gyp:snapshot', - '../ui/ui.gyp:ui', 'browser/speech/proto/speech_proto.gyp:speech_proto', ], 'export_dependent_settings': [ diff --git a/content/content_child.gypi b/content/content_child.gypi index a1f8b4b..8e4abc1 100644 --- a/content/content_child.gypi +++ b/content/content_child.gypi @@ -7,9 +7,9 @@ '../base/base.gyp:base', '../components/tracing.gyp:tracing', '../skia/skia.gyp:skia', + '../ui/base/ui_base.gyp:ui_base', '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', - '../ui/ui.gyp:ui', '../url/url.gyp:url_lib', ], 'include_dirs': [ diff --git a/content/content_common.gypi b/content/content_common.gypi index e2b9684..0dc9a5f 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -11,10 +11,10 @@ '../third_party/icu/icu.gyp:icuuc', '../third_party/libjingle/libjingle.gyp:libjingle', '../ui/accessibility/accessibility.gyp:accessibility', + '../ui/base/ui_base.gyp:ui_base', '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs', - '../ui/ui.gyp:ui', '../url/url.gyp:url_lib', ], 'include_dirs': [ diff --git a/content/content_ppapi_plugin.gypi b/content/content_ppapi_plugin.gypi index 60107db..55a77f3 100644 --- a/content/content_ppapi_plugin.gypi +++ b/content/content_ppapi_plugin.gypi @@ -8,9 +8,9 @@ 'dependencies': [ '../base/base.gyp:base', '../ppapi/ppapi_internal.gyp:ppapi_ipc', + '../ui/base/ui_base.gyp:ui_base', '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', - '../ui/ui.gyp:ui', ], 'sources': [ 'ppapi_plugin/broker_process_dispatcher.cc', diff --git a/content/content_shell.gypi b/content/content_shell.gypi index bc68b15..9996401 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -50,11 +50,11 @@ '../skia/skia.gyp:skia', '../third_party/WebKit/public/blink.gyp:blink', '../third_party/WebKit/public/blink.gyp:blink_web_test_support', + '../ui/base/ui_base.gyp:ui_base', '../ui/events/events.gyp:events_base', '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', '../ui/gl/gl.gyp:gl', - '../ui/ui.gyp:ui', '../url/url.gyp:url_lib', '../v8/tools/gyp/v8.gyp:v8', '../webkit/common/webkit_common.gyp:webkit_common', diff --git a/content/content_tests.gypi b/content/content_tests.gypi index e26d1e4..8efd76f 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -13,6 +13,7 @@ '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', '../ui/accessibility/accessibility.gyp:ax_gen', + '../ui/base/ui_base.gyp:ui_base', '../ui/events/events.gyp:dom4_keycode_converter', '../ui/events/events.gyp:events_base', '../ui/events/events.gyp:events_test_support', @@ -20,7 +21,6 @@ '../ui/gfx/gfx.gyp:gfx_geometry', '../ui/gfx/gfx.gyp:gfx_test_support', '../ui/resources/ui_resources.gyp:ui_resources', - '../ui/ui.gyp:ui', '../url/url.gyp:url_lib', 'browser/speech/proto/speech_proto.gyp:speech_proto', 'content.gyp:content_app_both', @@ -320,9 +320,9 @@ '../testing/gtest.gyp:gtest', '../third_party/re2/re2.gyp:re2', '../ui/accessibility/accessibility.gyp:accessibility', + '../ui/base/ui_base.gyp:ui_base', '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', - '../ui/ui.gyp:ui', ], 'include_dirs': [ '..', @@ -943,13 +943,13 @@ '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', '../third_party/mesa/mesa.gyp:osmesa', '../ui/accessibility/accessibility.gyp:accessibility', + '../ui/base/ui_base.gyp:ui_base', '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', '../ui/gl/gl.gyp:gl', '../ui/resources/ui_resources.gyp:ui_resources', '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs', '../ui/snapshot/snapshot.gyp:snapshot', - '../ui/ui.gyp:ui', '../webkit/child/webkit_child.gyp:webkit_child', '../ui/accessibility/accessibility.gyp:ax_gen', ], @@ -1195,11 +1195,11 @@ '../base/base.gyp:test_support_base', '../gpu/gpu.gyp:command_buffer_common', '../testing/gtest.gyp:gtest', + '../third_party/WebKit/public/blink.gyp:blink', + '../ui/base/ui_base.gyp:ui_base', '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', '../ui/gl/gl.gyp:gl', - '../ui/ui.gyp:ui', - '../third_party/WebKit/public/blink.gyp:blink', # The following two dependencies provide the missing # symbol HeapProfilerStart in Linux component builds. '../webkit/child/webkit_child.gyp:webkit_child', @@ -1227,11 +1227,11 @@ 'test_support_content', '../base/base.gyp:test_support_base', '../testing/gtest.gyp:gtest', + '../third_party/WebKit/public/blink.gyp:blink', + '../ui/base/ui_base.gyp:ui_base', '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', '../ui/gl/gl.gyp:gl', - '../ui/ui.gyp:ui', - '../third_party/WebKit/public/blink.gyp:blink', # The following two dependencies provide the missing # symbol HeapProfilerStart in Linux component builds. '../webkit/child/webkit_child.gyp:webkit_child', @@ -1265,14 +1265,14 @@ 'target_name': 'video_decode_accelerator_unittest', 'type': '<(gtest_target_type)', 'dependencies': [ - 'content.gyp:content', '../base/base.gyp:base', - '../testing/gtest.gyp:gtest', '../media/media.gyp:media', - '../ui/gl/gl.gyp:gl', + '../testing/gtest.gyp:gtest', + '../ui/base/ui_base.gyp:ui_base', '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', - '../ui/ui.gyp:ui', + '../ui/gl/gl.gyp:gl', + 'content.gyp:content', ], 'include_dirs': [ '<(DEPTH)/third_party/khronos', @@ -1365,14 +1365,14 @@ 'target_name': 'video_encode_accelerator_unittest', 'type': 'executable', 'dependencies': [ - 'content.gyp:content', '../base/base.gyp:base', - '../testing/gtest.gyp:gtest', '../media/media.gyp:media', - '../ui/gl/gl.gyp:gl', - '../ui/gfx/gfx.gyp:gfx', - '../ui/gfx/gfx.gyp:gfx_geometry', - '../ui/ui.gyp:ui', + '../testing/gtest.gyp:gtest', + '../ui/base/ui_base.gyp:ui_base', + '../ui/gfx/gfx.gyp:gfx', + '../ui/gfx/gfx.gyp:gfx_geometry', + '../ui/gl/gl.gyp:gl', + 'content.gyp:content', ], 'sources': [ 'common/gpu/media/video_accelerator_unittest_helpers.h', diff --git a/device/bluetooth/bluetooth.gyp b/device/bluetooth/bluetooth.gyp index fd76ec2..2d70842 100644 --- a/device/bluetooth/bluetooth.gyp +++ b/device/bluetooth/bluetooth.gyp @@ -15,9 +15,9 @@ '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../../net/net.gyp:net', '../../third_party/libxml/libxml.gyp:libxml', + '../../ui/base/ui_base.gyp:ui_base', '../../ui/gfx/gfx.gyp:gfx', '../../ui/gfx/gfx.gyp:gfx_geometry', - '../../ui/ui.gyp:ui', 'bluetooth_strings.gyp:device_bluetooth_strings', ], 'sources': [ diff --git a/gpu/command_buffer_service.gypi b/gpu/command_buffer_service.gypi index b51da1a..273d0ee 100644 --- a/gpu/command_buffer_service.gypi +++ b/gpu/command_buffer_service.gypi @@ -12,18 +12,18 @@ ], }, 'dependencies': [ - '../third_party/re2/re2.gyp:re2', '../base/base.gyp:base', '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../crypto/crypto.gyp:crypto', + '../third_party/khronos/khronos.gyp:khronos_headers', + '../third_party/protobuf/protobuf.gyp:protobuf_lite', + '../third_party/re2/re2.gyp:re2', + '../third_party/smhasher/smhasher.gyp:cityhash', + '../ui/base/ui_base.gyp:ui_base', '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', '../ui/gl/gl.gyp:gl', - '../ui/ui.gyp:ui', '<(angle_path)/src/build_angle.gyp:translator', - '../third_party/khronos/khronos.gyp:khronos_headers', - '../third_party/protobuf/protobuf.gyp:protobuf_lite', - '../third_party/smhasher/smhasher.gyp:cityhash', ], 'sources': [ 'command_buffer/service/async_pixel_transfer_delegate.cc', diff --git a/gpu/gles2_conform_support/gles2_conform_support.gyp b/gpu/gles2_conform_support/gles2_conform_support.gyp index 18ad18b..d59706e 100644 --- a/gpu/gles2_conform_support/gles2_conform_support.gyp +++ b/gpu/gles2_conform_support/gles2_conform_support.gyp @@ -35,14 +35,14 @@ 'type': 'static_library', 'dependencies': [ '../../base/base.gyp:base', - '../../gpu/gpu.gyp:gpu', - '../../gpu/gpu.gyp:gles2_implementation_client_side_arrays_no_check', '../../gpu/gpu.gyp:command_buffer_service', + '../../gpu/gpu.gyp:gles2_implementation_client_side_arrays_no_check', + '../../gpu/gpu.gyp:gpu', '../../third_party/khronos/khronos.gyp:khronos_headers', + '../../ui/base/ui_base.gyp:ui_base', '../../ui/gfx/gfx.gyp:gfx', '../../ui/gfx/gfx.gyp:gfx_geometry', '../../ui/gl/gl.gyp:gl', - '../../ui/ui.gyp:ui', ], 'sources': [ 'egl/config.cc', diff --git a/media/media.gyp b/media/media.gyp index 78ece80..8f81efe 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -918,9 +918,9 @@ '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h', + '../ui/base/ui_base.gyp:ui_base', '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', - '../ui/ui.gyp:ui', ], 'sources': [ 'audio/android/audio_android_unittest.cc', @@ -1167,17 +1167,17 @@ 'target_name': 'media_perftests', 'type': '<(gtest_target_type)', 'dependencies': [ - 'media', - 'media_test_support', - 'shared_memory_support', '../base/base.gyp:test_support_base', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', '../testing/perf/perf_test.gyp:perf_test', + '../ui/base/ui_base.gyp:ui_base', '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', '../ui/gl/gl.gyp:gl', - '../ui/ui.gyp:ui', + 'media', + 'media_test_support', + 'shared_memory_support', ], 'sources': [ 'base/audio_bus_perftest.cc', diff --git a/mojo/mojo_examples.gypi b/mojo/mojo_examples.gypi index 7c53b03..79531d8 100644 --- a/mojo/mojo_examples.gypi +++ b/mojo/mojo_examples.gypi @@ -113,9 +113,9 @@ 'dependencies': [ '../base/base.gyp:base', '../ui/aura/aura.gyp:aura', + '../ui/base/ui_base.gyp:ui_base', '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', - '../ui/ui.gyp:ui', 'mojo_aura_demo_support', 'mojo_common_lib', 'mojo_environment_chromium', @@ -158,9 +158,9 @@ '../base/base.gyp:base_i18n', '../ui/aura/aura.gyp:aura', '../ui/aura/aura.gyp:aura_test_support', + '../ui/base/ui_base.gyp:ui_base', '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', - '../ui/ui.gyp:ui', '../ui/views/views.gyp:views', '../url/url.gyp:url_lib', 'mojo_aura_demo_support', diff --git a/printing/printing.gyp b/printing/printing.gyp index f12e079..95f4357 100644 --- a/printing/printing.gyp +++ b/printing/printing.gyp @@ -236,13 +236,13 @@ 'target_name': 'printing_unittests', 'type': 'executable', 'dependencies': [ - 'printing', - '../testing/gtest.gyp:gtest', '../base/base.gyp:run_all_unittests', '../base/base.gyp:test_support_base', + '../testing/gtest.gyp:gtest', + '../ui/base/ui_base.gyp:ui_base', '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', - '../ui/ui.gyp:ui', + 'printing', ], 'sources': [ 'emf_win_unittest.cc', diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 70896c0..edde852 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -260,19 +260,19 @@ 'dependencies': [ '../base/base.gyp:base', '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', - '../ui/gfx/gfx.gyp:gfx', - '../ui/gfx/gfx.gyp:gfx_geometry', - '../ui/ui.gyp:ui', + '../media/media.gyp:media', + '../media/media.gyp:shared_memory_support', '../net/net.gyp:net', '../third_party/libvpx/libvpx.gyp:libvpx', '../third_party/libyuv/libyuv.gyp:libyuv', '../third_party/opus/opus.gyp:opus', '../third_party/protobuf/protobuf.gyp:protobuf_lite', - '../media/media.gyp:media', - '../media/media.gyp:shared_memory_support', - 'remoting_resources', - 'proto/chromotocol.gyp:chromotocol_proto_lib', '../third_party/webrtc/modules/modules.gyp:desktop_capture', + '../ui/base/ui_base.gyp:ui_base', + '../ui/gfx/gfx.gyp:gfx', + '../ui/gfx/gfx.gyp:gfx_geometry', + 'proto/chromotocol.gyp:chromotocol_proto_lib', + 'remoting_resources', ], 'export_dependent_settings': [ '../base/base.gyp:base', diff --git a/remoting/remoting_test.gypi b/remoting/remoting_test.gypi index 45860e8..ecfe60b 100644 --- a/remoting/remoting_test.gypi +++ b/remoting/remoting_test.gypi @@ -18,9 +18,9 @@ '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', '../third_party/webrtc/modules/modules.gyp:desktop_capture', + '../ui/base/ui_base.gyp:ui_base', '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', - '../ui/ui.gyp:ui', 'remoting_base', 'remoting_breakpad', 'remoting_client', diff --git a/tools/set_default_handler/set_default_handler.gyp b/tools/set_default_handler/set_default_handler.gyp index f9dfd6e..84c637e 100644 --- a/tools/set_default_handler/set_default_handler.gyp +++ b/tools/set_default_handler/set_default_handler.gyp @@ -11,10 +11,10 @@ 'type': 'executable', 'dependencies': [ '../../base/base.gyp:base', - '../../win8/win8.gyp:test_support_win8', + '../../ui/base/ui_base.gyp:ui_base', '../../ui/gfx/gfx.gyp:gfx', '../../ui/gfx/gfx.gyp:gfx_geometry', - '../../ui/ui.gyp:ui', + '../../win8/win8.gyp:test_support_win8', ], 'include_dirs': [ '../..', diff --git a/ui/app_list/app_list.gyp b/ui/app_list/app_list.gyp index 959243b..c9a21b5 100644 --- a/ui/app_list/app_list.gyp +++ b/ui/app_list/app_list.gyp @@ -16,11 +16,11 @@ '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../../skia/skia.gyp:skia', '../base/strings/ui_strings.gyp:ui_strings', + '../base/ui_base.gyp:ui_base', '../compositor/compositor.gyp:compositor', '../gfx/gfx.gyp:gfx', '../gfx/gfx.gyp:gfx_geometry', '../resources/ui_resources.gyp:ui_resources', - '../ui.gyp:ui', ], 'defines': [ 'APP_LIST_IMPLEMENTATION', @@ -198,10 +198,10 @@ '../../base/base.gyp:test_support_base', '../../skia/skia.gyp:skia', '../../testing/gtest.gyp:gtest', + '../base/ui_base.gyp:ui_base', '../compositor/compositor.gyp:compositor', '../resources/ui_resources.gyp:ui_resources', '../resources/ui_resources.gyp:ui_test_pak', - '../ui.gyp:ui', 'app_list', 'app_list_test_support', ], diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp index 5a16608..22703ea 100644 --- a/ui/aura/aura.gyp +++ b/ui/aura/aura.gyp @@ -16,12 +16,12 @@ '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../../gpu/gpu.gyp:gpu', '../../skia/skia.gyp:skia', + '../base/ui_base.gyp:ui_base', '../compositor/compositor.gyp:compositor', '../events/events.gyp:events', '../events/events.gyp:events_base', '../gfx/gfx.gyp:gfx', '../gfx/gfx.gyp:gfx_geometry', - '../ui.gyp:ui', ], 'defines': [ 'AURA_IMPLEMENTATION', @@ -146,13 +146,13 @@ 'dependencies': [ '../../skia/skia.gyp:skia', '../../testing/gtest.gyp:gtest', + '../base/ui_base.gyp:ui_base', '../compositor/compositor.gyp:compositor_test_support', '../events/events.gyp:events', '../events/events.gyp:events_base', '../events/events.gyp:events_test_support', '../gfx/gfx.gyp:gfx', '../gfx/gfx.gyp:gfx_geometry', - '../ui.gyp:ui', '../ui_unittests.gyp:ui_test_support', 'aura', ], @@ -199,12 +199,12 @@ '../../skia/skia.gyp:skia', '../../third_party/icu/icu.gyp:icui18n', '../../third_party/icu/icu.gyp:icuuc', + '../base/ui_base.gyp:ui_base', '../compositor/compositor.gyp:compositor', '../compositor/compositor.gyp:compositor_test_support', '../events/events.gyp:events', '../gfx/gfx.gyp:gfx', '../gfx/gfx.gyp:gfx_geometry', - '../ui.gyp:ui', 'aura', 'aura_test_support', ], @@ -225,12 +225,12 @@ '../../skia/skia.gyp:skia', '../../third_party/icu/icu.gyp:icui18n', '../../third_party/icu/icu.gyp:icuuc', + '../base/ui_base.gyp:ui_base', '../compositor/compositor.gyp:compositor', '../compositor/compositor.gyp:compositor_test_support', '../events/events.gyp:events', '../gfx/gfx.gyp:gfx', '../gfx/gfx.gyp:gfx_geometry', - '../ui.gyp:ui', 'aura', 'aura_test_support', ], @@ -248,6 +248,7 @@ '../../base/base.gyp:test_support_base', '../../skia/skia.gyp:skia', '../../testing/gtest.gyp:gtest', + '../base/ui_base.gyp:ui_base', '../compositor/compositor.gyp:compositor', '../compositor/compositor.gyp:compositor_test_support', '../events/events.gyp:events', @@ -255,7 +256,6 @@ '../gfx/gfx.gyp:gfx', '../gfx/gfx.gyp:gfx_geometry', '../gl/gl.gyp:gl', - '../ui.gyp:ui', '../ui_unittests.gyp:ui_test_support', 'aura_test_support', 'aura', diff --git a/ui/base/ui_base.gyp b/ui/base/ui_base.gyp new file mode 100644 index 0000000..6889c4b --- /dev/null +++ b/ui/base/ui_base.gyp @@ -0,0 +1,632 @@ +# Copyright 2014 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +{ + 'variables': { + 'chromium_code': 1, + }, + 'targets': [ + { + 'target_name': 'ui_base', + 'type': '<(component)', + 'dependencies': [ + '../../base/base.gyp:base', + '../../base/base.gyp:base_i18n', + '../../base/base.gyp:base_static', + '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', + '../../net/net.gyp:net', + '../../skia/skia.gyp:skia', + '../../third_party/icu/icu.gyp:icui18n', + '../../third_party/icu/icu.gyp:icuuc', + '../../url/url.gyp:url_lib', + '../events/events.gyp:events_base', + '../gfx/gfx.gyp:gfx', + '../gfx/gfx.gyp:gfx_geometry', + '../resources/ui_resources.gyp:ui_resources', + 'strings/ui_strings.gyp:ui_strings', + ], + 'defines': [ + 'UI_BASE_IMPLEMENTATION', + ], + 'export_dependent_settings': [ + '../../net/net.gyp:net', + '../gfx/gfx.gyp:gfx', + ], + 'sources' : [ + 'accelerators/accelerator.cc', + 'accelerators/accelerator.h', + 'accelerators/accelerator_manager.cc', + 'accelerators/accelerator_manager.h', + 'accelerators/menu_label_accelerator_util_linux.cc', + 'accelerators/menu_label_accelerator_util_linux.h', + 'accelerators/platform_accelerator.h', + 'accelerators/platform_accelerator_cocoa.h', + 'accelerators/platform_accelerator_cocoa.mm', + 'accelerators/platform_accelerator_gtk.cc', + 'accelerators/platform_accelerator_gtk.h', + 'android/ui_base_jni_registrar.cc', + 'android/ui_base_jni_registrar.h', + 'android/view_android.cc', + 'android/view_android.h', + 'android/window_android.cc', + 'android/window_android.h', + 'android/window_android_observer.h', + 'base_window.cc', + 'base_window.h', + 'clipboard/clipboard.cc', + 'clipboard/clipboard.h', + 'clipboard/clipboard_android.cc', + 'clipboard/clipboard_android_initialization.h', + 'clipboard/clipboard_aura.cc', + 'clipboard/clipboard_aurax11.cc', + 'clipboard/clipboard_constants.cc', + 'clipboard/clipboard_gtk.cc', + 'clipboard/clipboard_mac.mm', + 'clipboard/clipboard_types.h', + 'clipboard/clipboard_util_win.cc', + 'clipboard/clipboard_util_win.h', + 'clipboard/clipboard_win.cc', + 'clipboard/custom_data_helper.cc', + 'clipboard/custom_data_helper.h', + 'clipboard/custom_data_helper_linux.cc', + 'clipboard/custom_data_helper_mac.mm', + 'clipboard/scoped_clipboard_writer.cc', + 'clipboard/scoped_clipboard_writer.h', + 'cocoa/animation_utils.h', + 'cocoa/appkit_utils.h', + 'cocoa/appkit_utils.mm', + 'cocoa/base_view.h', + 'cocoa/base_view.mm', + 'cocoa/cocoa_base_utils.h', + 'cocoa/cocoa_base_utils.mm', + 'cocoa/controls/blue_label_button.h', + 'cocoa/controls/blue_label_button.mm', + 'cocoa/controls/hover_image_menu_button.h', + 'cocoa/controls/hover_image_menu_button.mm', + 'cocoa/controls/hover_image_menu_button_cell.h', + 'cocoa/controls/hover_image_menu_button_cell.mm', + 'cocoa/controls/hyperlink_button_cell.h', + 'cocoa/controls/hyperlink_button_cell.mm', + 'cocoa/find_pasteboard.h', + 'cocoa/find_pasteboard.mm', + 'cocoa/flipped_view.h', + 'cocoa/flipped_view.mm', + 'cocoa/focus_tracker.h', + 'cocoa/focus_tracker.mm', + 'cocoa/focus_window_set.h', + 'cocoa/focus_window_set.mm', + 'cocoa/fullscreen_window_manager.h', + 'cocoa/fullscreen_window_manager.mm', + 'cocoa/hover_button.h', + 'cocoa/hover_button.mm', + 'cocoa/hover_image_button.h', + 'cocoa/hover_image_button.mm', + 'cocoa/menu_controller.h', + 'cocoa/menu_controller.mm', + 'cocoa/nib_loading.h', + 'cocoa/nib_loading.mm', + 'cocoa/nsgraphics_context_additions.h', + 'cocoa/nsgraphics_context_additions.mm', + 'cocoa/tracking_area.h', + 'cocoa/tracking_area.mm', + 'cocoa/underlay_opengl_hosting_window.h', + 'cocoa/underlay_opengl_hosting_window.mm', + 'cocoa/view_description.h', + 'cocoa/view_description.mm', + 'cocoa/window_size_constants.h', + 'cocoa/window_size_constants.mm', + 'cursor/cursor.cc', + 'cursor/cursor.h', + 'cursor/cursor_android.cc', + 'cursor/cursor_loader.h', + 'cursor/cursor_loader_ozone.cc', + 'cursor/cursor_loader_ozone.h', + 'cursor/cursor_loader_win.cc', + 'cursor/cursor_loader_win.h', + 'cursor/cursor_loader_x11.cc', + 'cursor/cursor_loader_x11.h', + 'cursor/cursor_ozone.cc', + 'cursor/cursor_mac.mm', + 'cursor/cursor_win.cc', + 'cursor/cursor_x11.cc', + 'cursor/cursors_aura.cc', + 'cursor/cursors_aura.h', + 'cursor/ozone/cursor_factory_ozone.cc', + 'cursor/ozone/cursor_factory_ozone.h', + 'default_theme_provider.cc', + 'default_theme_provider.h', + 'default_theme_provider_mac.mm', + 'device_form_factor_android.cc', + 'device_form_factor_desktop.cc', + 'device_form_factor_ios.mm', + 'device_form_factor.h', + 'dragdrop/cocoa_dnd_util.h', + 'dragdrop/cocoa_dnd_util.mm', + 'dragdrop/drag_drop_types.h', + 'dragdrop/drag_drop_types_win.cc', + 'dragdrop/drag_source_win.cc', + 'dragdrop/drag_source_win.h', + 'dragdrop/drag_utils.cc', + 'dragdrop/drag_utils.h', + 'dragdrop/drag_utils_aura.cc', + 'dragdrop/drag_utils_win.cc', + 'dragdrop/drop_target_event.cc', + 'dragdrop/drop_target_event.h', + 'dragdrop/drop_target_win.cc', + 'dragdrop/drop_target_win.h', + 'dragdrop/gtk_dnd_util.cc', + 'dragdrop/gtk_dnd_util.h', + 'dragdrop/os_exchange_data.cc', + 'dragdrop/os_exchange_data.h', + 'dragdrop/os_exchange_data_provider_aura.cc', + 'dragdrop/os_exchange_data_provider_aura.h', + 'dragdrop/os_exchange_data_provider_aurax11.cc', + 'dragdrop/os_exchange_data_provider_aurax11.h', + 'dragdrop/os_exchange_data_provider_win.cc', + 'dragdrop/os_exchange_data_provider_win.h', + 'gtk/event_synthesis_gtk.cc', + 'gtk/event_synthesis_gtk.h', + 'gtk/focus_store_gtk.cc', + 'gtk/focus_store_gtk.h', + 'gtk/g_object_destructor_filo.cc', + 'gtk/g_object_destructor_filo.h', + 'gtk/gtk_expanded_container.cc', + 'gtk/gtk_expanded_container.h', + 'gtk/gtk_floating_container.cc', + 'gtk/gtk_floating_container.h', + 'gtk/gtk_hig_constants.h', + 'gtk/gtk_screen_util.cc', + 'gtk/gtk_screen_util.h', + 'gtk/gtk_signal.h', + 'gtk/gtk_signal_registrar.cc', + 'gtk/gtk_signal_registrar.h', + 'gtk/gtk_windowing.cc', + 'gtk/gtk_windowing.h', + 'gtk/owned_widget_gtk.cc', + 'gtk/owned_widget_gtk.h', + 'gtk/scoped_region.cc', + 'gtk/scoped_region.h', + 'hit_test.h', + 'l10n/formatter.cc', + 'l10n/formatter.h', + 'l10n/l10n_font_util.cc', + 'l10n/l10n_font_util.h', + 'l10n/l10n_util.cc', + 'l10n/l10n_util.h', + 'l10n/l10n_util_android.cc', + 'l10n/l10n_util_android.h', + 'l10n/l10n_util_collator.h', + 'l10n/l10n_util_mac.h', + 'l10n/l10n_util_mac.mm', + 'l10n/l10n_util_plurals.cc', + 'l10n/l10n_util_plurals.h', + 'l10n/l10n_util_posix.cc', + 'l10n/l10n_util_win.cc', + 'l10n/l10n_util_win.h', + 'l10n/time_format.cc', + 'l10n/time_format.h', + 'layout.cc', + 'layout.h', + 'layout_mac.mm', + 'models/button_menu_item_model.cc', + 'models/button_menu_item_model.h', + 'models/combobox_model.cc', + 'models/combobox_model.h', + 'models/combobox_model_observer.h', + 'models/dialog_model.cc', + 'models/dialog_model.h', + 'models/list_model.h', + 'models/list_model_observer.h', + 'models/list_selection_model.cc', + 'models/list_selection_model.h', + 'models/menu_model.cc', + 'models/menu_model.h', + 'models/menu_model_delegate.h', + 'models/menu_separator_types.h', + 'models/simple_menu_model.cc', + 'models/simple_menu_model.h', + 'models/table_model.cc', + 'models/table_model.h', + 'models/table_model_observer.h', + 'models/tree_model.cc', + 'models/tree_model.h', + 'models/tree_node_iterator.h', + 'models/tree_node_model.h', + 'nine_image_painter_factory.cc', + 'nine_image_painter_factory.h', + 'resource/data_pack.cc', + 'resource/data_pack.h', + 'resource/resource_bundle.cc', + 'resource/resource_bundle.h', + 'resource/resource_bundle_android.cc', + 'resource/resource_bundle_auralinux.cc', + 'resource/resource_bundle_gtk.cc', + 'resource/resource_bundle_ios.mm', + 'resource/resource_bundle_mac.mm', + 'resource/resource_bundle_win.cc', + 'resource/resource_bundle_win.h', + 'resource/resource_data_dll_win.cc', + 'resource/resource_data_dll_win.h', + 'resource/resource_handle.h', + 'text/bytes_formatting.cc', + 'text/bytes_formatting.h', + 'theme_provider.cc', + 'theme_provider.h', + 'touch/touch_device.cc', + 'touch/touch_device.h', + 'touch/touch_device_android.cc', + 'touch/touch_device_aurax11.cc', + 'touch/touch_device_ozone.cc', + 'touch/touch_device_win.cc', + 'touch/touch_editing_controller.cc', + 'touch/touch_editing_controller.h', + 'touch/touch_enabled.cc', + 'touch/touch_enabled.h', + 'ui_base_exports.cc', + 'ui_base_paths.cc', + 'ui_base_paths.h', + 'ui_base_switches.cc', + 'ui_base_switches.h', + 'ui_base_switches_util.cc', + 'ui_base_switches_util.h', + 'ui_base_types.cc', + 'ui_base_types.h', + 'ui_base_export.h', + 'view_prop.cc', + 'view_prop.h', + 'webui/jstemplate_builder.cc', + 'webui/jstemplate_builder.h', + 'webui/web_ui_util.cc', + 'webui/web_ui_util.h', + 'win/accessibility_ids_win.h', + 'win/accessibility_misc_utils.cc', + 'win/accessibility_misc_utils.h', + 'win/atl_module.h', + 'win/dpi_setup.cc', + 'win/dpi_setup.h', + 'win/foreground_helper.cc', + 'win/foreground_helper.h', + 'win/hidden_window.cc', + 'win/hidden_window.h', + 'win/hwnd_subclass.cc', + 'win/hwnd_subclass.h', + 'win/lock_state.cc', + 'win/lock_state.h', + 'win/message_box_win.cc', + 'win/message_box_win.h', + 'win/mouse_wheel_util.cc', + 'win/mouse_wheel_util.h', + 'win/scoped_ole_initializer.cc', + 'win/scoped_ole_initializer.h', + 'win/shell.cc', + 'win/shell.h', + 'win/touch_input.cc', + 'win/touch_input.h', + 'win/window_event_target.cc', + 'win/window_event_target.h', + 'window_open_disposition.cc', + 'window_open_disposition.h', + 'work_area_watcher_observer.h', + 'x/active_window_watcher_x.cc', + 'x/active_window_watcher_x.h', + 'x/active_window_watcher_x_observer.h', + 'x/root_window_property_watcher_x.cc', + 'x/root_window_property_watcher_x.h', + 'x/selection_owner.cc', + 'x/selection_owner.h', + 'x/selection_requestor.cc', + 'x/selection_requestor.h', + 'x/selection_utils.cc', + 'x/selection_utils.h', + 'x/work_area_watcher_x.cc', + 'x/work_area_watcher_x.h', + 'x/x11_util.cc', + 'x/x11_util.h', + 'x/x11_util_internal.h', + ], + 'target_conditions': [ + ['OS == "ios"', { + 'sources/': [ + ['include', '^l10n/l10n_util_mac\\.mm$'], + ], + }], + ], + 'conditions': [ + ['OS!="ios"', { + 'includes': [ + 'ime/ime.gypi', + ], + }, { # OS=="ios" + # iOS only uses a subset of UI. + 'sources/': [ + ['exclude', '\\.(cc|mm)$'], + ['include', '_ios\\.(cc|mm)$'], + ['include', '(^|/)ios/'], + ['include', '^l10n/'], + ['include', '^layout'], + ['include', '^resource/'], + ['include', '^ui_base_'], + ], + 'link_settings': { + 'libraries': [ + '$(SDKROOT)/System/Library/Frameworks/CoreGraphics.framework', + ], + }, + }], + ['toolkit_views==1', { + 'dependencies': [ + '../events/events.gyp:events', + ], + }], + ['use_aura==1', { + 'sources/': [ + ['exclude', 'clipboard/clipboard_mac.mm'], + ['exclude', 'layout_mac.mm'], + ['exclude', 'work_area_watcher_observer.h'], + ['exclude', 'x/active_window_watcher_x.cc'], + ['exclude', 'x/active_window_watcher_x.h'], + ['exclude', 'x/active_window_watcher_x_observer.h'], + ['exclude', 'x/root_window_property_watcher_x.cc'], + ['exclude', 'x/root_window_property_watcher_x.h'], + ['exclude', 'x/work_area_watcher_x.cc'], + ['exclude', 'x/work_area_watcher_x.h'], + ], + 'dependencies': [ + '../events/events.gyp:events', + ], + }, { # use_aura!=1 + 'sources!': [ + 'cursor/cursor.cc', + 'cursor/cursor.h', + 'cursor/cursor_loader_x11.cc', + 'cursor/cursor_loader_x11.h', + 'cursor/cursor_mac.mm', + 'cursor/cursor_win.cc', + 'cursor/cursor_x11.cc', + 'nine_image_painter_factory.cc', + 'nine_image_painter_factory.h', + 'x/selection_owner.cc', + 'x/selection_owner.h', + 'x/selection_requestor.cc', + 'x/selection_requestor.h', + 'x/selection_utils.cc', + 'x/selection_utils.h', + ] + }], + ['use_aura==0 or OS!="linux"', { + 'sources!': [ + 'resource/resource_bundle_auralinux.cc', + ], + }], + ['use_aura==1 and OS=="win"', { + 'sources/': [ + ['exclude', 'dragdrop/drag_utils_aura.cc'], + ], + }], + ['use_glib == 1', { + 'dependencies': [ + # font_gtk.cc uses fontconfig. + '../../build/linux/system.gyp:fontconfig', + '../../build/linux/system.gyp:glib', + ], + }], + ['desktop_linux == 1 or chromeos == 1', { + 'conditions': [ + ['toolkit_views==0 and use_aura==0', { + # Note: because of gyp predence rules this has to be defined as + # 'sources/' rather than 'sources!'. + 'sources/': [ + ['exclude', '^dragdrop/drag_utils.cc'], + ['exclude', '^dragdrop/drag_utils.h'], + ['exclude', '^dragdrop/os_exchange_data.cc'], + ['exclude', '^dragdrop/os_exchange_data.h'], + ], + }, { + # Note: because of gyp predence rules this has to be defined as + # 'sources/' rather than 'sources!'. + 'sources/': [ + ['include', '^dragdrop/os_exchange_data.cc'], + ], + }], + ], + }], + ['use_pango==1', { + 'dependencies': [ + '../../build/linux/system.gyp:pangocairo', + ], + }], + ['OS=="win" or use_clipboard_aurax11==1', { + 'sources!': [ + 'clipboard/clipboard_aura.cc', + ], + }, { + 'sources!': [ + 'clipboard/clipboard_aurax11.cc', + ], + }], + ['chromeos==1 or (use_aura==1 and OS=="linux" and use_x11==0)', { + 'sources!': [ + 'dragdrop/os_exchange_data_provider_aurax11.cc', + 'touch/touch_device.cc', + ], + }, { + 'sources!': [ + 'dragdrop/os_exchange_data_provider_aura.cc', + 'dragdrop/os_exchange_data_provider_aura.h', + 'touch/touch_device_aurax11.cc', + ], + }], + ['OS=="win"', { + 'sources!': [ + 'touch/touch_device.cc', + ], + 'include_dirs': [ + '../..', + '../../third_party/wtl/include', + ], + # TODO(jschuh): C4267: http://crbug.com/167187 size_t -> int + # C4324 is structure was padded due to __declspec(align()), which is + # uninteresting. + 'msvs_disabled_warnings': [ 4267, 4324 ], + 'msvs_settings': { + 'VCLinkerTool': { + 'DelayLoadDLLs': [ + 'd2d1.dll', + 'd3d10_1.dll', + 'dwmapi.dll', + ], + 'AdditionalDependencies': [ + 'd2d1.lib', + 'd3d10_1.lib', + 'dwmapi.lib', + ], + }, + }, + 'link_settings': { + 'libraries': [ + '-limm32.lib', + '-ld2d1.lib', + '-ldwmapi.lib', + '-loleacc.lib', + ], + }, + },{ # OS!="win" + 'conditions': [ + ['use_aura==0', { + 'sources!': [ + 'view_prop.cc', + 'view_prop.h', + ], + }], + ], + 'sources!': [ + 'dragdrop/drag_drop_types.h', + 'dragdrop/os_exchange_data.cc', + ], + }], + ['OS=="mac"', { + 'dependencies': [ + '../../third_party/mozilla/mozilla.gyp:mozilla', + ], + 'sources!': [ + 'dragdrop/drag_utils.cc', + 'dragdrop/drag_utils.h', + ], + 'link_settings': { + 'libraries': [ + '$(SDKROOT)/System/Library/Frameworks/Accelerate.framework', + '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework', + '$(SDKROOT)/System/Library/Frameworks/CoreVideo.framework', + ], + }, + }], + ['use_x11==1', { + 'all_dependent_settings': { + 'ldflags': [ + '-L<(PRODUCT_DIR)', + ], + }, + 'dependencies': [ + '../../build/linux/system.gyp:x11', + '../../build/linux/system.gyp:xcursor', + '../../build/linux/system.gyp:xext', + '../../build/linux/system.gyp:xfixes', + '../../build/linux/system.gyp:xrender', # For XRender* function calls in x11_util.cc. + ], + }], + ['toolkit_views==0', { + 'sources!': [ + 'dragdrop/drop_target_event.cc', + 'dragdrop/drop_target_event.h', + ], + }], + ['OS=="android"', { + 'sources!': [ + 'default_theme_provider.cc', + 'dragdrop/drag_utils.cc', + 'dragdrop/drag_utils.h', + 'l10n/l10n_font_util.cc', + 'models/button_menu_item_model.cc', + 'models/dialog_model.cc', + 'theme_provider.cc', + 'touch/touch_device.cc', + 'touch/touch_editing_controller.cc', + 'ui_base_types.cc', + ], + 'dependencies': [ + 'ui_base_jni_headers', + ], + 'link_settings': { + 'libraries': [ + '-ljnigraphics', + ], + }, + }], + ['OS=="android" and android_webview_build==0', { + 'dependencies': [ + '../android/ui_android.gyp:ui_java', + ], + }], + ['OS=="android" and use_aura==0', { + 'sources!': [ + 'cursor/cursor_android.cc' + ], + }], + ['OS=="android" and use_aura==1', { + 'sources!': [ + 'clipboard/clipboard_aura.cc' + ], + }], + ['OS=="android" or OS=="ios"', { + 'sources!': [ + 'device_form_factor_desktop.cc' + ], + }], + ['OS=="linux"', { + 'libraries': [ + '-ldl', + ], + }], + ['use_system_icu==1', { + # When using the system icu, the icu targets generate shim headers + # which are included by public headers in the ui target, so we need + # ui to be a hard dependency for all its users. + 'hard_dependency': 1, + }], + ], + }, + { + 'target_name': 'webui_test_support', + 'type': 'none', + 'direct_dependent_settings': { + 'include_dirs': [ + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources', + ] + } + }, + ], + 'conditions': [ + ['OS=="android"' , { + 'targets': [ + { + 'target_name': 'ui_base_jni_headers', + 'type': 'none', + 'sources': [ + '../android/java/src/org/chromium/ui/base/Clipboard.java', + '../android/java/src/org/chromium/ui/base/LocalizationUtils.java', + '../android/java/src/org/chromium/ui/base/SelectFileDialog.java', + '../android/java/src/org/chromium/ui/base/TouchDevice.java', + '../android/java/src/org/chromium/ui/base/ViewAndroid.java', + '../android/java/src/org/chromium/ui/base/WindowAndroid.java', + ], + 'variables': { + 'jni_gen_package': 'ui', + 'jni_generator_ptr_type': 'long', + }, + 'includes': [ '../../build/jni_generator.gypi' ], + }, + ], + }], + ], +} diff --git a/ui/compositor/compositor.gyp b/ui/compositor/compositor.gyp index 17427e4..18f6c8c 100644 --- a/ui/compositor/compositor.gyp +++ b/ui/compositor/compositor.gyp @@ -85,10 +85,10 @@ '<(DEPTH)/skia/skia.gyp:skia', '<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink_minimal', + '<(DEPTH)/ui/base/ui_base.gyp:ui_base', '<(DEPTH)/ui/gfx/gfx.gyp:gfx', '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry', '<(DEPTH)/ui/gl/gl.gyp:gl', - '<(DEPTH)/ui/ui.gyp:ui', '<(DEPTH)/webkit/common/gpu/webkit_gpu.gyp:webkit_gpu', 'compositor', ], @@ -135,11 +135,11 @@ '<(DEPTH)/cc/cc_tests.gyp:cc_test_support', '<(DEPTH)/skia/skia.gyp:skia', '<(DEPTH)/testing/gtest.gyp:gtest', + '<(DEPTH)/ui/base/ui_base.gyp:ui_base', '<(DEPTH)/ui/gfx/gfx.gyp:gfx', '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry', '<(DEPTH)/ui/gl/gl.gyp:gl', '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources', - '<(DEPTH)/ui/ui.gyp:ui', 'compositor', 'compositor_test_support', ], diff --git a/ui/keyboard/keyboard.gyp b/ui/keyboard/keyboard.gyp index 5de6ae0..ae05d8a 100644 --- a/ui/keyboard/keyboard.gyp +++ b/ui/keyboard/keyboard.gyp @@ -43,11 +43,11 @@ '../../skia/skia.gyp:skia', '../../url/url.gyp:url_lib', '../aura/aura.gyp:aura', + '../base/ui_base.gyp:ui_base', '../compositor/compositor.gyp:compositor', '../events/events.gyp:events', '../gfx/gfx.gyp:gfx', '../gfx/gfx.gyp:gfx_geometry', - '../ui.gyp:ui', '../wm/wm.gyp:wm_public', 'keyboard_resources', ], @@ -87,12 +87,12 @@ '../../url/url.gyp:url_lib', '../aura/aura.gyp:aura', '../aura/aura.gyp:aura_test_support', + '../base/ui_base.gyp:ui_base', '../compositor/compositor.gyp:compositor', '../compositor/compositor.gyp:compositor_test_support', '../gfx/gfx.gyp:gfx', '../gfx/gfx.gyp:gfx_geometry', '../resources/ui_resources.gyp:ui_test_pak', - '../ui.gyp:ui', 'keyboard', ], 'sources': [ diff --git a/ui/message_center/message_center.gyp b/ui/message_center/message_center.gyp index 8301a16..e3ea206 100644 --- a/ui/message_center/message_center.gyp +++ b/ui/message_center/message_center.gyp @@ -17,10 +17,10 @@ '../../skia/skia.gyp:skia', '../../url/url.gyp:url_lib', '../base/strings/ui_strings.gyp:ui_strings', + '../base/ui_base.gyp:ui_base', '../gfx/gfx.gyp:gfx', '../gfx/gfx.gyp:gfx_geometry', '../resources/ui_resources.gyp:ui_resources', - '../ui.gyp:ui', ], 'defines': [ 'MESSAGE_CENTER_IMPLEMENTATION', @@ -155,9 +155,9 @@ '../../base/base.gyp:base', '../../base/base.gyp:test_support_base', '../../skia/skia.gyp:skia', + '../base/ui_base.gyp:ui_base', '../gfx/gfx.gyp:gfx', '../gfx/gfx.gyp:gfx_geometry', - '../ui.gyp:ui', 'message_center', ], 'sources': [ @@ -178,11 +178,11 @@ '../../skia/skia.gyp:skia', '../../testing/gtest.gyp:gtest', '../../url/url.gyp:url_lib', + '../base/ui_base.gyp:ui_base', '../gfx/gfx.gyp:gfx', '../gfx/gfx.gyp:gfx_geometry', '../resources/ui_resources.gyp:ui_resources', '../resources/ui_resources.gyp:ui_test_pak', - '../ui.gyp:ui', 'message_center', 'message_center_test_support', ], diff --git a/ui/native_theme/native_theme.gyp b/ui/native_theme/native_theme.gyp index f176468..dcbf0dc 100644 --- a/ui/native_theme/native_theme.gyp +++ b/ui/native_theme/native_theme.gyp @@ -14,10 +14,10 @@ '../../base/base.gyp:base', '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../../skia/skia.gyp:skia', + '../base/ui_base.gyp:ui_base', '../gfx/gfx.gyp:gfx', '../gfx/gfx.gyp:gfx_geometry', '../resources/ui_resources.gyp:ui_resources', - '../ui.gyp:ui', ], 'defines': [ 'NATIVE_THEME_IMPLEMENTATION', diff --git a/ui/ozone/ime/ime.gypi b/ui/ozone/ime/ime.gypi index b912797..0334e06 100644 --- a/ui/ozone/ime/ime.gypi +++ b/ui/ozone/ime/ime.gypi @@ -4,7 +4,7 @@ { 'dependencies': [ - '<(DEPTH)/ui/ui.gyp:ui', + '<(DEPTH)/ui/base/ui_base.gyp:ui_base', ], 'sources': [ 'fake_input_method_context_ozone.cc', diff --git a/ui/shell_dialogs/shell_dialogs.gyp b/ui/shell_dialogs/shell_dialogs.gyp index 00234c8..7cd262d 100644 --- a/ui/shell_dialogs/shell_dialogs.gyp +++ b/ui/shell_dialogs/shell_dialogs.gyp @@ -15,7 +15,7 @@ '../../base/base.gyp:base_i18n', '../../skia/skia.gyp:skia', '../base/strings/ui_strings.gyp:ui_strings', - '../ui.gyp:ui', + '../base/ui_base.gyp:ui_base', ], 'defines': [ 'SHELL_DIALOGS_IMPLEMENTATION', @@ -62,7 +62,7 @@ ['OS=="android"', { 'dependencies': [ - '../ui.gyp:ui_base_jni_headers', + '../base/ui_base.gyp:ui_base_jni_headers', ], 'include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)/ui', diff --git a/ui/snapshot/snapshot.gyp b/ui/snapshot/snapshot.gyp index f556772..9dd9322 100644 --- a/ui/snapshot/snapshot.gyp +++ b/ui/snapshot/snapshot.gyp @@ -13,9 +13,9 @@ 'dependencies': [ '../../skia/skia.gyp:skia', '../../base/base.gyp:base', + '../base/ui_base.gyp:ui_base', '../gfx/gfx.gyp:gfx', '../gfx/gfx.gyp:gfx_geometry', - '../ui.gyp:ui', ], 'defines': [ 'SNAPSHOT_IMPLEMENTATION', @@ -52,9 +52,9 @@ '../../base/base.gyp:base', '../../base/base.gyp:test_support_base', '../../testing/gtest.gyp:gtest', + '../base/ui_base.gyp:ui_base', '../gfx/gfx.gyp:gfx', '../gfx/gfx.gyp:gfx_geometry', - '../ui.gyp:ui', 'snapshot' ], 'sources': [ diff --git a/ui/surface/surface.gyp b/ui/surface/surface.gyp index f58f05d..cc76b69 100644 --- a/ui/surface/surface.gyp +++ b/ui/surface/surface.gyp @@ -25,11 +25,11 @@ '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '<(DEPTH)/media/media.gyp:media', '<(DEPTH)/skia/skia.gyp:skia', + '<(DEPTH)/ui/base/ui_base.gyp:ui_base', '<(DEPTH)/ui/events/events.gyp:events_base', '<(DEPTH)/ui/gfx/gfx.gyp:gfx', '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry', '<(DEPTH)/ui/gl/gl.gyp:gl', - '<(DEPTH)/ui/ui.gyp:ui', ], 'sources': [ 'accelerated_surface_mac.cc', diff --git a/ui/ui.gyp b/ui/ui.gyp deleted file mode 100644 index 1050f45..0000000 --- a/ui/ui.gyp +++ /dev/null @@ -1,632 +0,0 @@ -# Copyright (c) 2012 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -{ - 'variables': { - 'chromium_code': 1, - }, - 'targets': [ - { - 'target_name': 'ui', - 'type': '<(component)', - 'dependencies': [ - '../base/base.gyp:base', - '../base/base.gyp:base_i18n', - '../base/base.gyp:base_static', - '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', - '../net/net.gyp:net', - '../skia/skia.gyp:skia', - '../third_party/icu/icu.gyp:icui18n', - '../third_party/icu/icu.gyp:icuuc', - '../url/url.gyp:url_lib', - 'base/strings/ui_strings.gyp:ui_strings', - 'events/events.gyp:events_base', - 'gfx/gfx.gyp:gfx', - 'gfx/gfx.gyp:gfx_geometry', - 'resources/ui_resources.gyp:ui_resources', - ], - 'defines': [ - 'UI_BASE_IMPLEMENTATION', - ], - 'export_dependent_settings': [ - '../net/net.gyp:net', - 'gfx/gfx.gyp:gfx', - ], - 'sources' : [ - 'base/accelerators/accelerator.cc', - 'base/accelerators/accelerator.h', - 'base/accelerators/accelerator_manager.cc', - 'base/accelerators/accelerator_manager.h', - 'base/accelerators/menu_label_accelerator_util_linux.cc', - 'base/accelerators/menu_label_accelerator_util_linux.h', - 'base/accelerators/platform_accelerator.h', - 'base/accelerators/platform_accelerator_cocoa.h', - 'base/accelerators/platform_accelerator_cocoa.mm', - 'base/accelerators/platform_accelerator_gtk.cc', - 'base/accelerators/platform_accelerator_gtk.h', - 'base/android/ui_base_jni_registrar.cc', - 'base/android/ui_base_jni_registrar.h', - 'base/android/view_android.cc', - 'base/android/view_android.h', - 'base/android/window_android.cc', - 'base/android/window_android.h', - 'base/android/window_android_observer.h', - 'base/base_window.cc', - 'base/base_window.h', - 'base/clipboard/clipboard.cc', - 'base/clipboard/clipboard.h', - 'base/clipboard/clipboard_android.cc', - 'base/clipboard/clipboard_android_initialization.h', - 'base/clipboard/clipboard_aura.cc', - 'base/clipboard/clipboard_aurax11.cc', - 'base/clipboard/clipboard_constants.cc', - 'base/clipboard/clipboard_gtk.cc', - 'base/clipboard/clipboard_mac.mm', - 'base/clipboard/clipboard_types.h', - 'base/clipboard/clipboard_util_win.cc', - 'base/clipboard/clipboard_util_win.h', - 'base/clipboard/clipboard_win.cc', - 'base/clipboard/custom_data_helper.cc', - 'base/clipboard/custom_data_helper.h', - 'base/clipboard/custom_data_helper_linux.cc', - 'base/clipboard/custom_data_helper_mac.mm', - 'base/clipboard/scoped_clipboard_writer.cc', - 'base/clipboard/scoped_clipboard_writer.h', - 'base/cocoa/animation_utils.h', - 'base/cocoa/appkit_utils.h', - 'base/cocoa/appkit_utils.mm', - 'base/cocoa/base_view.h', - 'base/cocoa/base_view.mm', - 'base/cocoa/cocoa_base_utils.h', - 'base/cocoa/cocoa_base_utils.mm', - 'base/cocoa/controls/blue_label_button.h', - 'base/cocoa/controls/blue_label_button.mm', - 'base/cocoa/controls/hover_image_menu_button.h', - 'base/cocoa/controls/hover_image_menu_button.mm', - 'base/cocoa/controls/hover_image_menu_button_cell.h', - 'base/cocoa/controls/hover_image_menu_button_cell.mm', - 'base/cocoa/controls/hyperlink_button_cell.h', - 'base/cocoa/controls/hyperlink_button_cell.mm', - 'base/cocoa/find_pasteboard.h', - 'base/cocoa/find_pasteboard.mm', - 'base/cocoa/flipped_view.h', - 'base/cocoa/flipped_view.mm', - 'base/cocoa/focus_tracker.h', - 'base/cocoa/focus_tracker.mm', - 'base/cocoa/focus_window_set.h', - 'base/cocoa/focus_window_set.mm', - 'base/cocoa/fullscreen_window_manager.h', - 'base/cocoa/fullscreen_window_manager.mm', - 'base/cocoa/hover_button.h', - 'base/cocoa/hover_button.mm', - 'base/cocoa/hover_image_button.h', - 'base/cocoa/hover_image_button.mm', - 'base/cocoa/menu_controller.h', - 'base/cocoa/menu_controller.mm', - 'base/cocoa/nib_loading.h', - 'base/cocoa/nib_loading.mm', - 'base/cocoa/nsgraphics_context_additions.h', - 'base/cocoa/nsgraphics_context_additions.mm', - 'base/cocoa/tracking_area.h', - 'base/cocoa/tracking_area.mm', - 'base/cocoa/underlay_opengl_hosting_window.h', - 'base/cocoa/underlay_opengl_hosting_window.mm', - 'base/cocoa/view_description.h', - 'base/cocoa/view_description.mm', - 'base/cocoa/window_size_constants.h', - 'base/cocoa/window_size_constants.mm', - 'base/cursor/cursor.cc', - 'base/cursor/cursor.h', - 'base/cursor/cursor_android.cc', - 'base/cursor/cursor_loader.h', - 'base/cursor/cursor_loader_ozone.cc', - 'base/cursor/cursor_loader_ozone.h', - 'base/cursor/cursor_loader_win.cc', - 'base/cursor/cursor_loader_win.h', - 'base/cursor/cursor_loader_x11.cc', - 'base/cursor/cursor_loader_x11.h', - 'base/cursor/cursor_ozone.cc', - 'base/cursor/cursor_mac.mm', - 'base/cursor/cursor_win.cc', - 'base/cursor/cursor_x11.cc', - 'base/cursor/cursors_aura.cc', - 'base/cursor/cursors_aura.h', - 'base/cursor/ozone/cursor_factory_ozone.cc', - 'base/cursor/ozone/cursor_factory_ozone.h', - 'base/default_theme_provider.cc', - 'base/default_theme_provider.h', - 'base/default_theme_provider_mac.mm', - 'base/device_form_factor_android.cc', - 'base/device_form_factor_desktop.cc', - 'base/device_form_factor_ios.mm', - 'base/device_form_factor.h', - 'base/dragdrop/cocoa_dnd_util.h', - 'base/dragdrop/cocoa_dnd_util.mm', - 'base/dragdrop/drag_drop_types.h', - 'base/dragdrop/drag_drop_types_win.cc', - 'base/dragdrop/drag_source_win.cc', - 'base/dragdrop/drag_source_win.h', - 'base/dragdrop/drag_utils.cc', - 'base/dragdrop/drag_utils.h', - 'base/dragdrop/drag_utils_aura.cc', - 'base/dragdrop/drag_utils_win.cc', - 'base/dragdrop/drop_target_event.cc', - 'base/dragdrop/drop_target_event.h', - 'base/dragdrop/drop_target_win.cc', - 'base/dragdrop/drop_target_win.h', - 'base/dragdrop/gtk_dnd_util.cc', - 'base/dragdrop/gtk_dnd_util.h', - 'base/dragdrop/os_exchange_data.cc', - 'base/dragdrop/os_exchange_data.h', - 'base/dragdrop/os_exchange_data_provider_aura.cc', - 'base/dragdrop/os_exchange_data_provider_aura.h', - 'base/dragdrop/os_exchange_data_provider_aurax11.cc', - 'base/dragdrop/os_exchange_data_provider_aurax11.h', - 'base/dragdrop/os_exchange_data_provider_win.cc', - 'base/dragdrop/os_exchange_data_provider_win.h', - 'base/gtk/event_synthesis_gtk.cc', - 'base/gtk/event_synthesis_gtk.h', - 'base/gtk/focus_store_gtk.cc', - 'base/gtk/focus_store_gtk.h', - 'base/gtk/g_object_destructor_filo.cc', - 'base/gtk/g_object_destructor_filo.h', - 'base/gtk/gtk_expanded_container.cc', - 'base/gtk/gtk_expanded_container.h', - 'base/gtk/gtk_floating_container.cc', - 'base/gtk/gtk_floating_container.h', - 'base/gtk/gtk_hig_constants.h', - 'base/gtk/gtk_screen_util.cc', - 'base/gtk/gtk_screen_util.h', - 'base/gtk/gtk_signal.h', - 'base/gtk/gtk_signal_registrar.cc', - 'base/gtk/gtk_signal_registrar.h', - 'base/gtk/gtk_windowing.cc', - 'base/gtk/gtk_windowing.h', - 'base/gtk/owned_widget_gtk.cc', - 'base/gtk/owned_widget_gtk.h', - 'base/gtk/scoped_region.cc', - 'base/gtk/scoped_region.h', - 'base/hit_test.h', - 'base/l10n/formatter.cc', - 'base/l10n/formatter.h', - 'base/l10n/l10n_font_util.cc', - 'base/l10n/l10n_font_util.h', - 'base/l10n/l10n_util.cc', - 'base/l10n/l10n_util.h', - 'base/l10n/l10n_util_android.cc', - 'base/l10n/l10n_util_android.h', - 'base/l10n/l10n_util_collator.h', - 'base/l10n/l10n_util_mac.h', - 'base/l10n/l10n_util_mac.mm', - 'base/l10n/l10n_util_plurals.cc', - 'base/l10n/l10n_util_plurals.h', - 'base/l10n/l10n_util_posix.cc', - 'base/l10n/l10n_util_win.cc', - 'base/l10n/l10n_util_win.h', - 'base/l10n/time_format.cc', - 'base/l10n/time_format.h', - 'base/layout.cc', - 'base/layout.h', - 'base/layout_mac.mm', - 'base/models/button_menu_item_model.cc', - 'base/models/button_menu_item_model.h', - 'base/models/combobox_model.cc', - 'base/models/combobox_model.h', - 'base/models/combobox_model_observer.h', - 'base/models/dialog_model.cc', - 'base/models/dialog_model.h', - 'base/models/list_model.h', - 'base/models/list_model_observer.h', - 'base/models/list_selection_model.cc', - 'base/models/list_selection_model.h', - 'base/models/menu_model.cc', - 'base/models/menu_model.h', - 'base/models/menu_model_delegate.h', - 'base/models/menu_separator_types.h', - 'base/models/simple_menu_model.cc', - 'base/models/simple_menu_model.h', - 'base/models/table_model.cc', - 'base/models/table_model.h', - 'base/models/table_model_observer.h', - 'base/models/tree_model.cc', - 'base/models/tree_model.h', - 'base/models/tree_node_iterator.h', - 'base/models/tree_node_model.h', - 'base/nine_image_painter_factory.cc', - 'base/nine_image_painter_factory.h', - 'base/resource/data_pack.cc', - 'base/resource/data_pack.h', - 'base/resource/resource_bundle.cc', - 'base/resource/resource_bundle.h', - 'base/resource/resource_bundle_android.cc', - 'base/resource/resource_bundle_auralinux.cc', - 'base/resource/resource_bundle_gtk.cc', - 'base/resource/resource_bundle_ios.mm', - 'base/resource/resource_bundle_mac.mm', - 'base/resource/resource_bundle_win.cc', - 'base/resource/resource_bundle_win.h', - 'base/resource/resource_data_dll_win.cc', - 'base/resource/resource_data_dll_win.h', - 'base/resource/resource_handle.h', - 'base/text/bytes_formatting.cc', - 'base/text/bytes_formatting.h', - 'base/theme_provider.cc', - 'base/theme_provider.h', - 'base/touch/touch_device.cc', - 'base/touch/touch_device.h', - 'base/touch/touch_device_android.cc', - 'base/touch/touch_device_aurax11.cc', - 'base/touch/touch_device_ozone.cc', - 'base/touch/touch_device_win.cc', - 'base/touch/touch_editing_controller.cc', - 'base/touch/touch_editing_controller.h', - 'base/touch/touch_enabled.cc', - 'base/touch/touch_enabled.h', - 'base/ui_base_exports.cc', - 'base/ui_base_paths.cc', - 'base/ui_base_paths.h', - 'base/ui_base_switches.cc', - 'base/ui_base_switches.h', - 'base/ui_base_switches_util.cc', - 'base/ui_base_switches_util.h', - 'base/ui_base_types.cc', - 'base/ui_base_types.h', - 'base/ui_base_export.h', - 'base/view_prop.cc', - 'base/view_prop.h', - 'base/webui/jstemplate_builder.cc', - 'base/webui/jstemplate_builder.h', - 'base/webui/web_ui_util.cc', - 'base/webui/web_ui_util.h', - 'base/win/accessibility_ids_win.h', - 'base/win/accessibility_misc_utils.cc', - 'base/win/accessibility_misc_utils.h', - 'base/win/atl_module.h', - 'base/win/dpi_setup.cc', - 'base/win/dpi_setup.h', - 'base/win/foreground_helper.cc', - 'base/win/foreground_helper.h', - 'base/win/hidden_window.cc', - 'base/win/hidden_window.h', - 'base/win/hwnd_subclass.cc', - 'base/win/hwnd_subclass.h', - 'base/win/lock_state.cc', - 'base/win/lock_state.h', - 'base/win/message_box_win.cc', - 'base/win/message_box_win.h', - 'base/win/mouse_wheel_util.cc', - 'base/win/mouse_wheel_util.h', - 'base/win/scoped_ole_initializer.cc', - 'base/win/scoped_ole_initializer.h', - 'base/win/shell.cc', - 'base/win/shell.h', - 'base/win/touch_input.cc', - 'base/win/touch_input.h', - 'base/win/window_event_target.cc', - 'base/win/window_event_target.h', - 'base/window_open_disposition.cc', - 'base/window_open_disposition.h', - 'base/work_area_watcher_observer.h', - 'base/x/active_window_watcher_x.cc', - 'base/x/active_window_watcher_x.h', - 'base/x/active_window_watcher_x_observer.h', - 'base/x/root_window_property_watcher_x.cc', - 'base/x/root_window_property_watcher_x.h', - 'base/x/selection_owner.cc', - 'base/x/selection_owner.h', - 'base/x/selection_requestor.cc', - 'base/x/selection_requestor.h', - 'base/x/selection_utils.cc', - 'base/x/selection_utils.h', - 'base/x/work_area_watcher_x.cc', - 'base/x/work_area_watcher_x.h', - 'base/x/x11_util.cc', - 'base/x/x11_util.h', - 'base/x/x11_util_internal.h', - ], - 'target_conditions': [ - ['OS == "ios"', { - 'sources/': [ - ['include', '^base/l10n/l10n_util_mac\\.mm$'], - ], - }], - ], - 'conditions': [ - ['OS!="ios"', { - 'includes': [ - 'base/ime/ime.gypi', - ], - }, { # OS=="ios" - # iOS only uses a subset of UI. - 'sources/': [ - ['exclude', '\\.(cc|mm)$'], - ['include', '_ios\\.(cc|mm)$'], - ['include', '(^|/)ios/'], - ['include', '^base/l10n/'], - ['include', '^base/layout'], - ['include', '^base/resource/'], - ['include', '^base/ui_base_'], - ], - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/CoreGraphics.framework', - ], - }, - }], - ['toolkit_views==1', { - 'dependencies': [ - 'events/events.gyp:events', - ], - }], - ['use_aura==1', { - 'sources/': [ - ['exclude', 'base/clipboard/clipboard_mac.mm'], - ['exclude', 'base/layout_mac.mm'], - ['exclude', 'base/work_area_watcher_observer.h'], - ['exclude', 'base/x/active_window_watcher_x.cc'], - ['exclude', 'base/x/active_window_watcher_x.h'], - ['exclude', 'base/x/active_window_watcher_x_observer.h'], - ['exclude', 'base/x/root_window_property_watcher_x.cc'], - ['exclude', 'base/x/root_window_property_watcher_x.h'], - ['exclude', 'base/x/work_area_watcher_x.cc'], - ['exclude', 'base/x/work_area_watcher_x.h'], - ], - 'dependencies': [ - 'events/events.gyp:events', - ], - }, { # use_aura!=1 - 'sources!': [ - 'base/cursor/cursor.cc', - 'base/cursor/cursor.h', - 'base/cursor/cursor_loader_x11.cc', - 'base/cursor/cursor_loader_x11.h', - 'base/cursor/cursor_mac.mm', - 'base/cursor/cursor_win.cc', - 'base/cursor/cursor_x11.cc', - 'base/nine_image_painter_factory.cc', - 'base/nine_image_painter_factory.h', - 'base/x/selection_owner.cc', - 'base/x/selection_owner.h', - 'base/x/selection_requestor.cc', - 'base/x/selection_requestor.h', - 'base/x/selection_utils.cc', - 'base/x/selection_utils.h', - ] - }], - ['use_aura==0 or OS!="linux"', { - 'sources!': [ - 'base/resource/resource_bundle_auralinux.cc', - ], - }], - ['use_aura==1 and OS=="win"', { - 'sources/': [ - ['exclude', 'base/dragdrop/drag_utils_aura.cc'], - ], - }], - ['use_glib == 1', { - 'dependencies': [ - # font_gtk.cc uses fontconfig. - '../build/linux/system.gyp:fontconfig', - '../build/linux/system.gyp:glib', - ], - }], - ['desktop_linux == 1 or chromeos == 1', { - 'conditions': [ - ['toolkit_views==0 and use_aura==0', { - # Note: because of gyp predence rules this has to be defined as - # 'sources/' rather than 'sources!'. - 'sources/': [ - ['exclude', '^base/dragdrop/drag_utils.cc'], - ['exclude', '^base/dragdrop/drag_utils.h'], - ['exclude', '^base/dragdrop/os_exchange_data.cc'], - ['exclude', '^base/dragdrop/os_exchange_data.h'], - ], - }, { - # Note: because of gyp predence rules this has to be defined as - # 'sources/' rather than 'sources!'. - 'sources/': [ - ['include', '^base/dragdrop/os_exchange_data.cc'], - ], - }], - ], - }], - ['use_pango==1', { - 'dependencies': [ - '../build/linux/system.gyp:pangocairo', - ], - }], - ['OS=="win" or use_clipboard_aurax11==1', { - 'sources!': [ - 'base/clipboard/clipboard_aura.cc', - ], - }, { - 'sources!': [ - 'base/clipboard/clipboard_aurax11.cc', - ], - }], - ['chromeos==1 or (use_aura==1 and OS=="linux" and use_x11==0)', { - 'sources!': [ - 'base/dragdrop/os_exchange_data_provider_aurax11.cc', - 'base/touch/touch_device.cc', - ], - }, { - 'sources!': [ - 'base/dragdrop/os_exchange_data_provider_aura.cc', - 'base/dragdrop/os_exchange_data_provider_aura.h', - 'base/touch/touch_device_aurax11.cc', - ], - }], - ['OS=="win"', { - 'sources!': [ - 'base/touch/touch_device.cc', - ], - 'include_dirs': [ - '../', - '../third_party/wtl/include', - ], - # TODO(jschuh): C4267: http://crbug.com/167187 size_t -> int - # C4324 is structure was padded due to __declspec(align()), which is - # uninteresting. - 'msvs_disabled_warnings': [ 4267, 4324 ], - 'msvs_settings': { - 'VCLinkerTool': { - 'DelayLoadDLLs': [ - 'd2d1.dll', - 'd3d10_1.dll', - 'dwmapi.dll', - ], - 'AdditionalDependencies': [ - 'd2d1.lib', - 'd3d10_1.lib', - 'dwmapi.lib', - ], - }, - }, - 'link_settings': { - 'libraries': [ - '-limm32.lib', - '-ld2d1.lib', - '-ldwmapi.lib', - '-loleacc.lib', - ], - }, - },{ # OS!="win" - 'conditions': [ - ['use_aura==0', { - 'sources!': [ - 'base/view_prop.cc', - 'base/view_prop.h', - ], - }], - ], - 'sources!': [ - 'base/dragdrop/drag_drop_types.h', - 'base/dragdrop/os_exchange_data.cc', - ], - }], - ['OS=="mac"', { - 'dependencies': [ - '../third_party/mozilla/mozilla.gyp:mozilla', - ], - 'sources!': [ - 'base/dragdrop/drag_utils.cc', - 'base/dragdrop/drag_utils.h', - ], - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/Accelerate.framework', - '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework', - '$(SDKROOT)/System/Library/Frameworks/CoreVideo.framework', - ], - }, - }], - ['use_x11==1', { - 'all_dependent_settings': { - 'ldflags': [ - '-L<(PRODUCT_DIR)', - ], - }, - 'dependencies': [ - '../build/linux/system.gyp:x11', - '../build/linux/system.gyp:xcursor', - '../build/linux/system.gyp:xext', - '../build/linux/system.gyp:xfixes', - '../build/linux/system.gyp:xrender', # For XRender* function calls in x11_util.cc. - ], - }], - ['toolkit_views==0', { - 'sources!': [ - 'base/dragdrop/drop_target_event.cc', - 'base/dragdrop/drop_target_event.h', - ], - }], - ['OS=="android"', { - 'sources!': [ - 'base/default_theme_provider.cc', - 'base/dragdrop/drag_utils.cc', - 'base/dragdrop/drag_utils.h', - 'base/l10n/l10n_font_util.cc', - 'base/models/button_menu_item_model.cc', - 'base/models/dialog_model.cc', - 'base/theme_provider.cc', - 'base/touch/touch_device.cc', - 'base/touch/touch_editing_controller.cc', - 'base/ui_base_types.cc', - ], - 'dependencies': [ - 'ui_base_jni_headers', - ], - 'link_settings': { - 'libraries': [ - '-ljnigraphics', - ], - }, - }], - ['OS=="android" and android_webview_build==0', { - 'dependencies': [ - 'android/ui_android.gyp:ui_java', - ], - }], - ['OS=="android" and use_aura==0', { - 'sources!': [ - 'base/cursor/cursor_android.cc' - ], - }], - ['OS=="android" and use_aura==1', { - 'sources!': [ - 'base/clipboard/clipboard_aura.cc' - ], - }], - ['OS=="android" or OS=="ios"', { - 'sources!': [ - 'base/device_form_factor_desktop.cc' - ], - }], - ['OS=="linux"', { - 'libraries': [ - '-ldl', - ], - }], - ['use_system_icu==1', { - # When using the system icu, the icu targets generate shim headers - # which are included by public headers in the ui target, so we need - # ui to be a hard dependency for all its users. - 'hard_dependency': 1, - }], - ], - }, - { - 'target_name': 'webui_test_support', - 'type': 'none', - 'direct_dependent_settings': { - 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources', - ] - } - }, - ], - 'conditions': [ - ['OS=="android"' , { - 'targets': [ - { - 'target_name': 'ui_base_jni_headers', - 'type': 'none', - 'sources': [ - 'android/java/src/org/chromium/ui/base/Clipboard.java', - 'android/java/src/org/chromium/ui/base/LocalizationUtils.java', - 'android/java/src/org/chromium/ui/base/SelectFileDialog.java', - 'android/java/src/org/chromium/ui/base/TouchDevice.java', - 'android/java/src/org/chromium/ui/base/ViewAndroid.java', - 'android/java/src/org/chromium/ui/base/WindowAndroid.java', - ], - 'variables': { - 'jni_gen_package': 'ui', - 'jni_generator_ptr_type': 'long', - }, - 'includes': [ '../build/jni_generator.gypi' ], - }, - ], - }], - ], -} diff --git a/ui/ui_unittests.gyp b/ui/ui_unittests.gyp index ed20e60..9106b4f 100644 --- a/ui/ui_unittests.gyp +++ b/ui/ui_unittests.gyp @@ -70,11 +70,11 @@ '../third_party/libpng/libpng.gyp:libpng', '../url/url.gyp:url_lib', 'base/strings/ui_strings.gyp:ui_strings', + 'base/ui_base.gyp:ui_base', 'events/events.gyp:events_base', 'gfx/gfx.gyp:gfx_test_support', 'resources/ui_resources.gyp:ui_resources', 'resources/ui_resources.gyp:ui_test_pak', - 'ui.gyp:ui', 'ui_test_support', ], # iOS uses a small subset of ui. common_sources are the only files that diff --git a/ui/views/controls/webview/webview.gyp b/ui/views/controls/webview/webview.gyp index 2c08e29..39d4020 100644 --- a/ui/views/controls/webview/webview.gyp +++ b/ui/views/controls/webview/webview.gyp @@ -17,10 +17,10 @@ '../../../../content/content.gyp:content_browser', '../../../../skia/skia.gyp:skia', '../../../../url/url.gyp:url_lib', + '../../../base/ui_base.gyp:ui_base', '../../../events/events.gyp:events', '../../../gfx/gfx.gyp:gfx', '../../../gfx/gfx.gyp:gfx_geometry', - '../../../ui.gyp:ui', '../../../web_dialogs/web_dialogs.gyp:web_dialogs', '../../views.gyp:views', ], diff --git a/ui/views/linux_ui/linux_ui.gyp b/ui/views/linux_ui/linux_ui.gyp index 1f87a1a..5ba78e5 100644 --- a/ui/views/linux_ui/linux_ui.gyp +++ b/ui/views/linux_ui/linux_ui.gyp @@ -14,9 +14,9 @@ '../../base/base.gyp:base', '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../../skia/skia.gyp:skia', + '../base/ui_base.gyp:ui_base', '../native_theme/native_theme.gyp:native_theme', '../resources/ui_resources.gyp:ui_resources', - '../ui.gyp:ui', ], 'defines': [ 'LINUX_UI_IMPLEMENTATION', diff --git a/ui/views/views.gyp b/ui/views/views.gyp index 81124a1..069633c 100644 --- a/ui/views/views.gyp +++ b/ui/views/views.gyp @@ -28,6 +28,7 @@ '../accessibility/accessibility.gyp:ax_gen', '../aura/aura.gyp:aura', '../base/strings/ui_strings.gyp:ui_strings', + '../base/ui_base.gyp:ui_base', '../compositor/compositor.gyp:compositor', '../events/events.gyp:events', '../events/events.gyp:events_base', @@ -35,7 +36,6 @@ '../gfx/gfx.gyp:gfx_geometry', '../native_theme/native_theme.gyp:native_theme', '../resources/ui_resources.gyp:ui_resources', - '../ui.gyp:ui', '../wm/wm.gyp:wm_public', ], 'export_dependent_settings': [ @@ -548,11 +548,11 @@ '../../testing/gtest.gyp:gtest', '../aura/aura.gyp:aura', '../aura/aura.gyp:aura_test_support', + '../base/ui_base.gyp:ui_base', '../compositor/compositor.gyp:compositor', '../events/events.gyp:events', '../gfx/gfx.gyp:gfx', '../gfx/gfx.gyp:gfx_geometry', - '../ui.gyp:ui', 'views', ], 'include_dirs': [ @@ -603,10 +603,10 @@ '../../skia/skia.gyp:skia', '../../testing/gtest.gyp:gtest', '../aura/aura.gyp:aura', + '../base/ui_base.gyp:ui_base', '../events/events.gyp:events', '../gfx/gfx.gyp:gfx', '../gfx/gfx.gyp:gfx_geometry', - '../ui.gyp:ui', 'controls/webview/webview.gyp:webview', 'views_test_support', 'views', @@ -635,6 +635,7 @@ '../aura/aura.gyp:aura', '../aura/aura.gyp:aura_test_support', '../base/strings/ui_strings.gyp:ui_strings', + '../base/ui_base.gyp:ui_base', '../compositor/compositor.gyp:compositor', '../compositor/compositor.gyp:compositor_test_support', '../events/events.gyp:events', @@ -642,7 +643,6 @@ '../gfx/gfx.gyp:gfx_geometry', '../resources/ui_resources.gyp:ui_resources', '../resources/ui_resources.gyp:ui_test_pak', - '../ui.gyp:ui', '../ui_unittests.gyp:ui_test_support', '../wm/wm.gyp:wm_public', 'views', @@ -779,12 +779,12 @@ '../../third_party/icu/icu.gyp:icui18n', '../../third_party/icu/icu.gyp:icuuc', '../aura/aura.gyp:aura', + '../base/ui_base.gyp:ui_base', '../events/events.gyp:events', '../gfx/gfx.gyp:gfx', '../gfx/gfx.gyp:gfx_geometry', '../resources/ui_resources.gyp:ui_resources', '../resources/ui_resources.gyp:ui_test_pak', - '../ui.gyp:ui', 'views', ], 'include_dirs': [ @@ -863,11 +863,11 @@ '../../base/base.gyp:base', '../../base/base.gyp:base_i18n', '../aura/aura.gyp:aura', + '../base/ui_base.gyp:ui_base', '../compositor/compositor.gyp:compositor', '../compositor/compositor.gyp:compositor_test_support', '../gfx/gfx.gyp:gfx', '../resources/ui_resources.gyp:ui_test_pak', - '../ui.gyp:ui', 'views', 'views_examples_lib', 'views_test_support', @@ -888,12 +888,12 @@ '../../third_party/icu/icu.gyp:icuuc', '../../url/url.gyp:url_lib', '../aura/aura.gyp:aura', + '../base/ui_base.gyp:ui_base', '../events/events.gyp:events', '../gfx/gfx.gyp:gfx', '../gfx/gfx.gyp:gfx_geometry', '../resources/ui_resources.gyp:ui_resources', '../resources/ui_resources.gyp:ui_test_pak', - '../ui.gyp:ui', 'controls/webview/webview.gyp:webview', 'views', 'views_examples_lib', @@ -934,13 +934,13 @@ '../../third_party/icu/icu.gyp:icui18n', '../../third_party/icu/icu.gyp:icuuc', '../aura/aura.gyp:aura', + '../base/ui_base.gyp:ui_base', '../compositor/compositor.gyp:compositor', '../events/events.gyp:events', '../gfx/gfx.gyp:gfx', '../gfx/gfx.gyp:gfx_geometry', '../resources/ui_resources.gyp:ui_resources', '../resources/ui_resources.gyp:ui_test_pak', - '../ui.gyp:ui', '../wm/wm.gyp:wm_test_support', 'views', 'views_examples_with_content_lib', diff --git a/webkit/child/webkit_child.gyp b/webkit/child/webkit_child.gyp index d3dda2a..f8f7256 100644 --- a/webkit/child/webkit_child.gyp +++ b/webkit/child/webkit_child.gyp @@ -42,7 +42,6 @@ '<(DEPTH)/ui/gfx/gfx.gyp:gfx', '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry', '<(DEPTH)/ui/native_theme/native_theme.gyp:native_theme', - '<(DEPTH)/ui/ui.gyp:ui', '<(DEPTH)/url/url.gyp:url_lib', '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', '<(DEPTH)/webkit/common/webkit_common.gyp:webkit_common', diff --git a/webkit/common/webkit_common.gyp b/webkit/common/webkit_common.gyp index 0342642..13f5af6 100644 --- a/webkit/common/webkit_common.gyp +++ b/webkit/common/webkit_common.gyp @@ -20,10 +20,10 @@ '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '<(DEPTH)/net/net.gyp:net', '<(DEPTH)/skia/skia.gyp:skia', + '<(DEPTH)/ui/base/ui_base.gyp:ui_base', '<(DEPTH)/ui/gfx/gfx.gyp:gfx', '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry', '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources', - '<(DEPTH)/ui/ui.gyp:ui', '<(DEPTH)/url/url.gyp:url_lib', '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources', ], diff --git a/win8/delegate_execute/delegate_execute.gyp b/win8/delegate_execute/delegate_execute.gyp index a2fa150..be827a0 100644 --- a/win8/delegate_execute/delegate_execute.gyp +++ b/win8/delegate_execute/delegate_execute.gyp @@ -44,9 +44,9 @@ '../../chrome/chrome.gyp:installer_util', '../../content/content.gyp:content_common', '../../google_update/google_update.gyp:google_update', + '../../ui/base/ui_base.gyp:ui_base', '../../ui/gfx/gfx.gyp:gfx', '../../ui/gfx/gfx.gyp:gfx_geometry', - '../../ui/ui.gyp:ui', '../../win8/win8.gyp:check_sdk_patch', 'delegate_execute_version_resources', ], |