Revert 229507 "aura: Allow creating content_shell without views."

trunk/src/content/content_shell.gypi

 # 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': {
     'content_shell_product_name': 'Content Shell',
     # The "19" is so that sites that sniff for version think that this is
     # something reasonably current; the "77.34.5" is a hint that this isn't a
     # standard Chrome.
@@ skipping 112 matching lines @@
         'shell/browser/shell_plugin_service_filter.cc',
         'shell/browser/shell_plugin_service_filter.h',
         'shell/browser/shell_quota_permission_context.cc',
         'shell/browser/shell_quota_permission_context.h',
         'shell/browser/shell_resource_dispatcher_host_delegate.cc',
         'shell/browser/shell_resource_dispatcher_host_delegate.h',
         'shell/browser/shell_speech_recognition_manager_delegate.cc',
         'shell/browser/shell_speech_recognition_manager_delegate.h',
         'shell/browser/shell_url_request_context_getter.cc',
         'shell/browser/shell_url_request_context_getter.h',
-        'shell/browser/shell_views.cc',
         'shell/browser/shell_web_contents_view_delegate_android.cc',
         'shell/browser/shell_web_contents_view_delegate_creator.h',
         'shell/browser/shell_web_contents_view_delegate_gtk.cc',
         'shell/browser/shell_web_contents_view_delegate.h',
         'shell/browser/shell_web_contents_view_delegate_mac.mm',
         'shell/browser/shell_web_contents_view_delegate_win.cc',
         'shell/browser/shell_win.cc',
         'shell/browser/webkit_test_controller.cc',
         'shell/browser/webkit_test_controller.h',
         'shell/common/shell_content_client.cc',
@@ skipping 68 matching lines @@
         ['(os_posix==1 and use_aura==1 and linux_use_tcmalloc==1) or (android_use_tcmalloc==1)', {
           'dependencies': [
             # This is needed by content/app/content_main_runner.cc
             '../base/allocator/allocator.gyp:allocator',
           ],
         }],
         ['use_aura==1', {
           'dependencies': [
             '../ui/aura/aura.gyp:aura',
             '../ui/base/strings/ui_strings.gyp:ui_strings',
+            '../ui/views/controls/webview/webview.gyp:webview',
+            '../ui/views/views.gyp:views',
+            '../ui/views/views.gyp:views_test_support',
+            '../ui/ui.gyp:ui_resources',
           ],
           'sources/': [
             ['exclude', 'shell/browser/shell_gtk.cc'],
             ['exclude', 'shell/browser/shell_win.cc'],
           ],
-          'conditions': [
-            ['toolkit_views==1', {
-              'dependencies': [
-                '../ui/views/controls/webview/webview.gyp:webview',
-                '../ui/views/views.gyp:views',
-                '../ui/views/views.gyp:views_test_support',
-                '../ui/ui.gyp:ui_resources',
-              ],
-              'sources/': [
-                ['exclude', 'shell/browser/shell_aura.cc'],
-              ],
-            }, {
-              'sources/': [
-                ['exclude', 'shell/browser/shell_views.cc'],
-              ],
-            }],
-          ],
         }],  # use_aura==1
         ['chromeos==1', {
           'dependencies': [
             '../chromeos/chromeos.gyp:chromeos',
             '../ui/shell/shell.gyp:shell',
            ],
         }], # chromeos==1
         ['use_ash==1', {
           'dependencies': [
             '../ash/ash.gyp:ash',
@@ skipping 540 matching lines @@
                 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb',
                 '--destination_dir', '<(dest_dir)',
               ],
             },
           ],
         },
       ],
     }],  # OS=="win" and fastbuild==0 and target_arch=="ia32"
   ]
 }