Extract content dependency from keyboard code

ui/keyboard/keyboard.gyp

Index: ui/keyboard/keyboard.gyp
diff --git a/ui/keyboard/keyboard.gyp b/ui/keyboard/keyboard.gyp
index 2f4fcdd980b1fae467973cc4d5f188179a9cfd3e..ec042bc887f8121a4822d918d6e539c6f4b2a2b0 100644
--- a/ui/keyboard/keyboard.gyp
+++ b/ui/keyboard/keyboard.gyp
@@ -45,15 +45,12 @@
     {
       # GN version: //ui/keyboard
       'target_name': 'keyboard',
-      'type': '<(component)',
+      'type': 'static_library',
       'dependencies': [
         '../../base/base.gyp:base',
         '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '../../content/content.gyp:content_browser',
-        '../../ipc/ipc.gyp:ipc',
         '../../media/media.gyp:media',
         '../../skia/skia.gyp:skia',
-        '../../url/url.gyp:url_lib',
         '../aura/aura.gyp:aura',
         '../base/ime/ui_base_ime.gyp:ui_base_ime',
         '../base/ui_base.gyp:ui_base',
@@ -63,27 +60,22 @@
         '../events/events.gyp:events_base',
         '../gfx/gfx.gyp:gfx',
         '../gfx/gfx.gyp:gfx_geometry',
-        '../wm/wm.gyp:wm',
         'keyboard_resources',
       ],
       'defines': [
         'KEYBOARD_IMPLEMENTATION',

[sky, 2015/10/09 18:23:29]

Because you're changing the type is this still necessary? It seems weird that
the type is static_library, yet you still have KEYBOARD_EXPORT in these files. 

       ],
       'sources': [
-        'keyboard.cc',
-        'keyboard.h',
-        'keyboard_constants.cc',
-        'keyboard_constants.h',
         'keyboard_controller.cc',
         'keyboard_controller.h',
         'keyboard_controller_observer.h',
-        'keyboard_controller_proxy.cc',
-        'keyboard_controller_proxy.h',
         'keyboard_export.h',
         'keyboard_layout_manager.cc',
         'keyboard_layout_manager.h',
         'keyboard_switches.cc',
         'keyboard_switches.h',
+        'keyboard_ui.cc',
+        'keyboard_ui.h',
         'keyboard_util.cc',
         'keyboard_util.h',
       ],
@@ -96,6 +88,44 @@
       ],
     },
     {
+      # GN version: //ui/keyboard:keyboard_with_content
+      'target_name': 'keyboard_with_content',
+      'type': '<(component)',
+      'dependencies': [
+        'keyboard',
+        '../../base/base.gyp:base',
+        '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+        '../../content/content.gyp:content_browser',
+        '../../ipc/ipc.gyp:ipc',
+        '../../skia/skia.gyp:skia',
+        '../../url/url.gyp:url_lib',
+        '../aura/aura.gyp:aura',
+        '../base/ime/ui_base_ime.gyp:ui_base_ime',
+        '../base/ui_base.gyp:ui_base',
+        '../compositor/compositor.gyp:compositor',
+        '../events/events.gyp:dom_keycode_converter',
+        '../events/events.gyp:events',
+        '../events/events.gyp:events_base',
+        '../gfx/gfx.gyp:gfx',
+        '../gfx/gfx.gyp:gfx_geometry',
+        '../wm/wm.gyp:wm',
+        'keyboard_resources',
+      ],
+      'defines': [
+        'KEYBOARD_IMPLEMENTATION',
+      ],
+      'sources': [
+        'content/keyboard.cc',
+        'content/keyboard.h',
+        'content/keyboard_constants.cc',
+        'content/keyboard_constants.h',
+        'content/keyboard_content_util.cc',
+        'content/keyboard_content_util.h',
+        'content/keyboard_ui_content.cc',
+        'content/keyboard_ui_content.h',
+      ],
+    },
+    {
       'target_name': 'keyboard_unittests',
       'type': '<(gtest_target_type)',
       'dependencies': [
@@ -115,7 +145,7 @@
         '../gfx/gfx.gyp:gfx_geometry',
         '../resources/ui_resources.gyp:ui_test_pak',
         '../wm/wm.gyp:wm',
-        'keyboard',
+        'keyboard_with_content',
       ],
       'sources': [
         'keyboard_controller_unittest.cc',