MacViews: gyp changes for a non-aura toolkit views on mac

wm.gyp:wm depends on aura.gyp:aura, so this ensures that any gyp
use_aura guards also guard wm.gyp. Also fix some toolkit_views/use_aura
gyp usage, and add mac stubs for ui/base/dragdrop so the gyp conditions
don't explode (they will be needed later).

BUG=366007

Review URL: https://codereview.chromium.org/248893002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266283 0039d316-1c4b-4281-b951-d872f2087c98

chrome/chrome_browser_ui.gypi

@@ -2557,20 +2557,6 @@
             'safe_browsing_report_proto',
           ],
         }],
-        ['toolkit_views == 1', {
-          'dependencies': [
-            '../ui/wm/wm.gyp:wm',
-          ],
-          'sources!': [
-            'browser/ui/profile_reset_bubble_stub.cc',
-          ],
-        }, {  # toolkit_views == 0
-          'sources!': [
-            'browser/ui/tabs/tab_strip_layout_type.h',
-            'browser/ui/tabs/tab_strip_layout_type_prefs.cc',
-            'browser/ui/tabs/tab_strip_layout_type_prefs.h',
-          ],
-        }],
         ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:udev',
@@ -2676,6 +2662,9 @@
           ],
         }],
         ['use_aura==1', {
+          'sources!': [
+            'browser/ui/profile_reset_bubble_stub.cc',
+          ],
           'sources/': [
             ['exclude', '^browser/ui/screen_capture_notification_ui_stub.cc'],
             # TODO: (stevenjb/beng): Find a home for these.
@@ -2691,6 +2680,7 @@
             '../ui/aura/aura.gyp:aura',
             '../ui/keyboard/keyboard.gyp:keyboard',
             '../ui/keyboard/keyboard.gyp:keyboard_resources',
+            '../ui/wm/wm.gyp:wm',
           ],
           'conditions': [
             ['OS=="win"', {
@@ -2714,6 +2704,11 @@
             }],
           ],
         }, { # else: use_aura==0
+          'sources!': [
+            'browser/ui/tabs/tab_strip_layout_type.h',
+            'browser/ui/tabs/tab_strip_layout_type_prefs.cc',
+            'browser/ui/tabs/tab_strip_layout_type_prefs.h',
+          ],
           'sources/': [
             ['exclude', '^browser/ui/views/frame/browser_desktop_window_tree_host.h'],
             ['exclude', '^browser/ui/views/frame/browser_desktop_window_tree_host_win.cc'],

chrome/chrome_tests_unit.gypi

@@ -2106,6 +2106,7 @@
         }],
         ['use_aura==1', {
           'dependencies': [
+            '../ui/wm/wm.gyp:wm',
             '../ui/aura/aura.gyp:aura_test_support',
           ],
           'sources/': [
@@ -2125,7 +2126,6 @@
         ['use_aura==1 or toolkit_views==1', {
           'dependencies': [
             '../ui/events/events.gyp:events_test_support',
-            '../ui/wm/wm.gyp:wm',
           ],
         }],
         ['use_aura==1 and component=="shared_library"', {

ui/app_list/app_list.gyp

@@ -143,6 +143,7 @@
         ['use_aura==1', {
           'dependencies': [
             '../aura/aura.gyp:aura',
+            '../wm/wm.gyp:wm',
           ],
         }],
         ['toolkit_views==1', {
@@ -151,7 +152,6 @@
             '../events/events.gyp:events',
             '../views/controls/webview/webview.gyp:webview',
             '../views/views.gyp:views',
-            '../wm/wm.gyp:wm',
           ],
         }, {  # toolkit_views==0
           'sources/': [

ui/base/dragdrop/drag_utils_mac.mm

+// 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.
+
+#include "ui/base/dragdrop/drag_utils.h"
+
+#include "base/logging.h"
+
+namespace drag_utils {
+
+void SetDragImageOnDataObject(const gfx::Canvas& canvas,
+                              const gfx::Size& size,
+                              const gfx::Vector2d& cursor_offset,
+                              ui::OSExchangeData* data_object) {
+  NOTIMPLEMENTED();
+}
+
+void SetDragImageOnDataObject(const gfx::ImageSkia& image_skia,
+                              const gfx::Size& size,
+                              const gfx::Vector2d& cursor_offset,
+                              ui::OSExchangeData* data_object) {
+  NOTIMPLEMENTED();
+}
+
+}  // namespace drag_utils

ui/base/dragdrop/os_exchange_data_provider_mac.mm

+// 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.
+
+#include "ui/base/dragdrop/os_exchange_data.h"
+
+#include "base/logging.h"
+
+///////////////////////////////////////////////////////////////////////////////
+// OSExchangeData, public:
+
+namespace ui {
+
+// static
+OSExchangeData::Provider* OSExchangeData::CreateProvider() {
+  NOTIMPLEMENTED();
+  return NULL;
+}
+
+}  // namespace ui

ui/base/ui_base.gyp

@@ -153,6 +153,7 @@
         'dragdrop/drag_utils.cc',
         'dragdrop/drag_utils.h',
         'dragdrop/drag_utils_aura.cc',
+        'dragdrop/drag_utils_mac.mm',
         'dragdrop/drag_utils_win.cc',
         'dragdrop/drop_target_event.cc',
         'dragdrop/drop_target_event.h',
@@ -166,6 +167,7 @@
         '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_mac.mm',
         'dragdrop/os_exchange_data_provider_win.cc',
         'dragdrop/os_exchange_data_provider_win.h',
         'hit_test.h',
@@ -354,8 +356,6 @@
             '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',
@@ -388,14 +388,6 @@
               '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'],
               ],
             }],
           ],
@@ -469,10 +461,6 @@
               ],
             }],
           ],
-          'sources!': [
-            'dragdrop/drag_drop_types.h',
-            'dragdrop/os_exchange_data.cc',
-          ],
         }],
         ['OS=="mac"', {
           'dependencies': [
@@ -506,8 +494,13 @@
         }],
         ['toolkit_views==0', {
           'sources!': [
+            'dragdrop/drag_drop_types.h',
             'dragdrop/drop_target_event.cc',
             'dragdrop/drop_target_event.h',
+            'dragdrop/os_exchange_data.cc',
+            'dragdrop/os_exchange_data.h',
+            'nine_image_painter_factory.cc',
+            'nine_image_painter_factory.h',
           ],
         }],
         ['OS=="android"', {

ui/gfx/gfx.gyp

@@ -348,7 +348,7 @@
             ],
           },
         }],
-        ['use_aura==0', {
+        ['toolkit_views==0', {
           'sources!': [
             'nine_image_painter.cc',
             'nine_image_painter.h',

ui/views/views.gyp

@@ -5,6 +5,16 @@
   'variables': {
     'chromium_code': 1,
   },
+  'target_defaults': {
+    'conditions': [
+      ['use_aura==1', {
+        'dependencies': [
+          '../aura/aura.gyp:aura',
+          '../wm/wm.gyp:wm',
+        ],
+      }],
+    ],
+  },
   'targets': [
     {
       'target_name': 'views',
@@ -19,7 +29,6 @@
         '../../url/url.gyp:url_lib',
         '../accessibility/accessibility.gyp:accessibility',
         '../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',
@@ -29,7 +38,6 @@
         '../gfx/gfx.gyp:gfx_geometry',
         '../native_theme/native_theme.gyp:native_theme',
         '../resources/ui_resources.gyp:ui_resources',
-        '../wm/wm.gyp:wm',
       ],
       'export_dependent_settings': [
         '../accessibility/accessibility.gyp:ax_gen',
@@ -508,14 +516,11 @@
         '../../ipc/ipc.gyp:test_support_ipc',
         '../../skia/skia.gyp:skia',
         '../../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',
-        '../wm/wm.gyp:wm',
         'views',
       ],
       'include_dirs': [
@@ -552,6 +557,11 @@
             'test/ui_controls_factory_desktop_aurax11.h',
           ],
         }],
+        ['use_aura==1', {
+          'dependencies': [
+            '../aura/aura.gyp:aura_test_support',
+          ],
+        }],
       ],
     },  # target_name: views_test_support
     {
@@ -567,8 +577,6 @@
         '../../third_party/icu/icu.gyp:icuuc',
         '../../url/url.gyp:url_lib',
         '../accessibility/accessibility.gyp:accessibility',
-        '../aura/aura.gyp:aura',
-        '../aura/aura.gyp:aura_test_support',
         '../base/strings/ui_strings.gyp:ui_strings',
         '../base/ui_base.gyp:ui_base',
         '../base/ui_base.gyp:ui_base_test_support',
@@ -579,7 +587,6 @@
         '../gfx/gfx.gyp:gfx_geometry',
         '../resources/ui_resources.gyp:ui_resources',
         '../resources/ui_resources.gyp:ui_test_pak',
-        '../wm/wm.gyp:wm',
         'views',
         'views_test_support',
       ],
@@ -694,6 +701,11 @@
             'corewm/capture_controller_unittest.cc',
           ],
         }],
+        ['use_aura==1', {
+          'dependencies': [
+            '../aura/aura.gyp:aura_test_support',
+          ],
+        }],
       ],
     },  # target_name: views_unittests
   ],