Extract content dependency from keyboard code

chrome/chrome_browser_ui.gypi

 # Copyright 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': {
     # There are two sections of sources:
     # * "Platform"-based sources (OS, toolkit, etc.)
     # * Feature/directory-based sources (e.g., history, printing)
 
@@ skipping 494 matching lines @@
       'browser/ui/ash/app_list/app_list_service_ash.h',
       'browser/ui/ash/app_list/app_sync_ui_state_watcher.cc',
       'browser/ui/ash/app_list/app_sync_ui_state_watcher.h',
       'browser/ui/ash/app_sync_ui_state.cc',
       'browser/ui/ash/app_sync_ui_state.h',
       'browser/ui/ash/app_sync_ui_state_factory.cc',
       'browser/ui/ash/app_sync_ui_state_factory.h',
       'browser/ui/ash/app_sync_ui_state_observer.h',
       'browser/ui/ash/ash_init.cc',
       'browser/ui/ash/ash_init.h',
-      'browser/ui/ash/ash_keyboard_controller_proxy.cc',
-      'browser/ui/ash/ash_keyboard_controller_proxy.h',
       'browser/ui/ash/ash_util.cc',
       'browser/ui/ash/ash_util.h',
       'browser/ui/ash/cast_config_delegate_chromeos.cc',
       'browser/ui/ash/cast_config_delegate_chromeos.h',
+      'browser/ui/ash/chrome_keyboard_ui.cc',
+      'browser/ui/ash/chrome_keyboard_ui.h',
       'browser/ui/ash/chrome_launcher_prefs.cc',
       'browser/ui/ash/chrome_launcher_prefs.h',
       'browser/ui/ash/chrome_new_window_delegate.cc',
       'browser/ui/ash/chrome_new_window_delegate.h',
       'browser/ui/ash/chrome_new_window_delegate_chromeos.cc',
       'browser/ui/ash/chrome_new_window_delegate_chromeos.h',
       'browser/ui/ash/chrome_screenshot_grabber.cc',
       'browser/ui/ash/chrome_screenshot_grabber.h',
       'browser/ui/ash/chrome_shell_content_state.cc',
       'browser/ui/ash/chrome_shell_content_state.h',
@@ skipping 2432 matching lines @@
           'defines': [ 'FRAME_AVATAR_BUTTON=1', ],
           'sources': [ '<@(chrome_browser_ui_desktop_sources)' ],
         }],
         ['use_aura==1', {
           'sources': [ '<@(chrome_browser_ui_aura_sources)'] ,
           'dependencies': [
             # aura uses some of ash resources.
             '../ash/ash_resources.gyp:ash_resources',
             '../ui/aura/aura.gyp:aura',
             '../ui/keyboard/keyboard.gyp:keyboard',
+            '../ui/keyboard/keyboard.gyp:keyboard_with_content',
             '../ui/keyboard/keyboard.gyp:keyboard_resources',
             '../ui/wm/wm.gyp:wm',
           ],
           'conditions': [
             ['chromeos == 0', {
               'sources': [ '<@(chrome_browser_ui_aura_non_chromeos)' ],
             }],
           ],
         }],
         ['ui_compositor_image_transport==1', {
@@ skipping 243 matching lines @@
           ],
           'sources': [
             '<@(chrome_browser_ui_non_mobile_sources)',
             '<@(chrome_browser_ui_omnibox_non_mobile_sources)',
           ],
         }],
       ],
     },
   ],
 }