From 27b328bf38b552b1576c0a0368c00a36be5ec781 Mon Sep 17 00:00:00 2001 From: paulmeyer Date: Wed, 17 Jun 2015 14:26:12 -0700 Subject: Revert of Revert of views: Move TOOLKIT_VIEWS definition in //ui/views/ from root. (patchset #1 id:1 of https://codereview.chromium.org/1192583002/) Reason for revert: Unreverting because this CL did not end up being the problem. Original issue's description: > Revert of views: Move TOOLKIT_VIEWS definition in //ui/views/ from root. (patchset #6 id:100001 of https://codereview.chromium.org/1175603002/) > > Reason for revert: > Speculative revert to fix win unit_test failures. https://build.chromium.org/p/chromium.win/builders/Win7%20Tests%20%281%29/builds/39651 > > Original issue's description: > > views: Move TOOLKIT_VIEWS definition in //ui/views/ from root. > > > > If 'toolkit_views' gyp/gn flag is toggled, then it shouldn't cause targets that > > do not depend on views to be rebuilt. To make this happen, remove the definition > > of the TOOLKIT_VIEWS flag from the top-level config into a config in views, so > > that only targets that explicitly depend on views get the define, and are > > affected by the switch. > > > > BUG=500004 > > R=ben@chromium.org, sky@chromium.org > > > > Committed: https://chromium.googlesource.com/chromium/src/+/c13fc9ff0aedca62ebfdfc27d44c6b5ac204c9d8 > > TBR=ben@chromium.org,sky@chromium.org,sadrul@chromium.org > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=500004 > > Committed: https://crrev.com/ecbf7e40116d555c11ee958b6339618920d11c2c > Cr-Commit-Position: refs/heads/master@{#334820} TBR=ben@chromium.org,sky@chromium.org,sadrul@chromium.org,phoglund@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=500004 Review URL: https://codereview.chromium.org/1182053007 Cr-Commit-Position: refs/heads/master@{#334923} --- build/common.gypi | 3 --- build/config/BUILD.gn | 3 --- chrome/browser/BUILD.gn | 4 ++++ chrome/browser/extensions/BUILD.gn | 18 +++++++++++------- chrome/chrome_browser.gypi | 5 +++++ chrome/chrome_browser_extensions.gypi | 5 +++++ chrome/chrome_tests_unit.gypi | 5 +++++ components/bookmarks.gypi | 5 +++++ components/bookmarks/browser/BUILD.gn | 1 + components/components_tests.gyp | 1 + ui/app_list/BUILD.gn | 4 ++++ ui/app_list/app_list.gyp | 3 +++ ui/gfx/native_widget_types.h | 2 ++ ui/views/BUILD.gn | 5 +++++ ui/views/views.gyp | 5 +++++ 15 files changed, 56 insertions(+), 13 deletions(-) diff --git a/build/common.gypi b/build/common.gypi index a78095e..43c3c74 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -2667,9 +2667,6 @@ ['component=="shared_library"', { 'defines': ['COMPONENT_BUILD'], }], - ['toolkit_views==1', { - 'defines': ['TOOLKIT_VIEWS=1'], - }], ['ui_compositor_image_transport==1', { 'defines': ['UI_COMPOSITOR_IMAGE_TRANSPORT'], }], diff --git a/build/config/BUILD.gn b/build/config/BUILD.gn index f28f0cf..d1e6ee7 100644 --- a/build/config/BUILD.gn +++ b/build/config/BUILD.gn @@ -90,9 +90,6 @@ config("feature_flags") { # TODO(brettw) should probably be "=1". defines += [ "USE_UDEV" ] } - if (toolkit_views) { - defines += [ "TOOLKIT_VIEWS=1" ] - } if (ui_compositor_image_transport) { # TODO(brettw) should probably be "=1". defines += [ "UI_COMPOSITOR_IMAGE_TRANSPORT" ] diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn index 27daed1..5312a68 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn @@ -301,6 +301,10 @@ source_set("browser") { "//ui/web_dialogs", "//v8", ] + + if (toolkit_views) { + deps += [ "//ui/views" ] + } } else { # iOS sources += rebase_path(gypi_values.chrome_browser_ios_sources, ".", "//chrome") diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn index 1befad5..61bb6de 100644 --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn @@ -116,6 +116,17 @@ source_set("extensions") { ] } + if (use_aura) { + deps += [ + "//ui/keyboard", + "//ui/keyboard:resources", + ] + } + + if (toolkit_views) { + deps += [ "//ui/views" ] + } + if (is_linux) { configs += [ "//build/config/linux:fontconfig" ] deps += [ "//dbus" ] @@ -156,13 +167,6 @@ source_set("extensions") { sources += [ "api/braille_display_private/braille_controller_stub.cc" ] } - if (use_aura) { - deps += [ - "//ui/keyboard", - "//ui/keyboard:resources", - ] - } - # chromeos uses its own global_shortcut_listener, _x11 is not necessary. if (is_chromeos || !use_x11) { sources -= [ diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 99ade1d..c86be79 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -3290,6 +3290,11 @@ # chrome/browser/metrics/variations/generate_resources_map.py '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/metrics/variations/generated_resources_map.cc', ], + 'conditions': [ + ['toolkit_views==1', { + 'dependencies': [ '../ui/views/views.gyp:views' ], + }], + ], }, { # OS == "ios" 'dependencies': [ '../net/net.gyp:net', diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi index ed322d4..c473555 100644 --- a/chrome/chrome_browser_extensions.gypi +++ b/chrome/chrome_browser_extensions.gypi @@ -1015,6 +1015,11 @@ '../ui/keyboard/keyboard.gyp:keyboard_resources', ], }], + ['toolkit_views==1', { + 'dependencies': [ + '../ui/views/views.gyp:views', + ], + }], ['OS=="linux"', { 'conditions': [ ['use_aura==1', { diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index 8e8eb1c..94497eb 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -2094,6 +2094,11 @@ '../remoting/remoting.gyp:remoting_client_plugin', ], }], + ['toolkit_views==1', { + 'dependencies': [ + '../ui/views/views.gyp:views', + ], + }], ], }, { diff --git a/components/bookmarks.gypi b/components/bookmarks.gypi index 0ac445b..eabb68a 100644 --- a/components/bookmarks.gypi +++ b/components/bookmarks.gypi @@ -78,6 +78,11 @@ 'bookmarks/common/android/component_jni_registrar.h', ], }], + ['toolkit_views==1', { + 'dependencies': [ + '<(DEPTH)/ui/views/views.gyp:views', + ], + }], ], }, { diff --git a/components/bookmarks/browser/BUILD.gn b/components/bookmarks/browser/BUILD.gn index 8d1719d..9a68995 100644 --- a/components/bookmarks/browser/BUILD.gn +++ b/components/bookmarks/browser/BUILD.gn @@ -59,6 +59,7 @@ source_set("browser") { if (toolkit_views) { sources += [ "bookmark_node_data_views.cc" ] + deps += [ "//ui/views" ] } } diff --git a/components/components_tests.gyp b/components/components_tests.gyp index 251f568..1b037f4 100644 --- a/components/components_tests.gyp +++ b/components/components_tests.gyp @@ -851,6 +851,7 @@ 'constrained_window/constrained_window_views_unittest.cc', ], 'dependencies': [ + '<(DEPTH)/ui/views/views.gyp:views', '<(DEPTH)/ui/views/views.gyp:views_test_support', 'components.gyp:constrained_window', ] diff --git a/ui/app_list/BUILD.gn b/ui/app_list/BUILD.gn index 8a1634f..680dcca 100644 --- a/ui/app_list/BUILD.gn +++ b/ui/app_list/BUILD.gn @@ -171,6 +171,10 @@ component("app_list") { "//ui/events", "//ui/views", ] + + public_deps = [ + "//ui/views", + ] } if (is_mac) { diff --git a/ui/app_list/app_list.gyp b/ui/app_list/app_list.gyp index 1efa03f..1ea28b1 100644 --- a/ui/app_list/app_list.gyp +++ b/ui/app_list/app_list.gyp @@ -195,6 +195,9 @@ '../events/events.gyp:events', '../views/views.gyp:views', ], + 'export_dependent_settings': [ + '../views/views.gyp:views', + ], }, { # toolkit_views==0 'sources/': [ ['exclude', 'views/'], diff --git a/ui/gfx/native_widget_types.h b/ui/gfx/native_widget_types.h index f9811f9..0ce333c 100644 --- a/ui/gfx/native_widget_types.h +++ b/ui/gfx/native_widget_types.h @@ -135,6 +135,8 @@ typedef void* NativeCursor; typedef ui::ViewAndroid* NativeView; typedef ui::WindowAndroid* NativeWindow; typedef jobject NativeEvent; +#else +#error Unknown build environment. #endif #if defined(OS_WIN) diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn index 2769a11..37a35e8 100644 --- a/ui/views/BUILD.gn +++ b/ui/views/BUILD.gn @@ -11,7 +11,12 @@ gypi_values = exec_script("//build/gypi_to_gn.py", "scope", [ "views.gyp" ]) +config("flags") { + defines = [ "TOOLKIT_VIEWS=1" ] +} + component("views") { + all_dependent_configs = [ ":flags" ] sources = gypi_values.views_sources # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. diff --git a/ui/views/views.gyp b/ui/views/views.gyp index ce21772..6fc3d42 100644 --- a/ui/views/views.gyp +++ b/ui/views/views.gyp @@ -624,6 +624,11 @@ '../resources/ui_resources.gyp:ui_resources', '../strings/ui_strings.gyp:ui_strings', ], + 'all_dependent_settings': { + 'defines': [ + 'TOOLKIT_VIEWS=1', + ], + }, 'export_dependent_settings': [ '../accessibility/accessibility.gyp:ax_gen', ], -- cgit v1.1