make content_shell and content_browsertests works with aura

BUG=138525
TEST=content_browsertests


Review URL: https://chromiumcodereview.appspot.com/10824043

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

content/content_shell.gypi

@@ -146,12 +146,29 @@
             '<(SHARED_INTERMEDIATE_DIR)/content/shell',
           ],
         }],  # OS=="android"
+        ['os_posix==1 and use_aura==1 and linux_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/views.gyp:views',
+            '../ui/ui.gyp:ui_resources',
+          ],
           'sources/': [
             ['exclude', 'shell/shell_gtk.cc'],
             ['exclude', 'shell/shell_win.cc'],
           ],
         }],  # use_aura==1
+        ['chromeos==1', {
+          'dependencies': [
+            '../chromeos/chromeos.gyp:chromeos',
+           ],
+        }], # chromeos==1
         ['inside_chromium_build==0 or component!="shared_library"', {
           'dependencies': [
             '<(webkit_src_dir)/Source/WebCore/WebCore.gyp/WebCore.gyp:webcore_test_support',
@@ -230,7 +247,9 @@
               '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/ui/app_locale_settings/app_locale_settings_en-US.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/ui/ui_strings/ui_strings_en-US.pak',
               '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',

content/shell/DEPS

 include_rules = [
   "+v8/include",
 
+  # For chromeos build config
+  "+chromeos/dbus",
+
   # The content_shell is the canonical sample embedder, so it only uses
   # content's public API.
   "+content/public",
@@ -10,4 +13,8 @@ include_rules = [
 
   # Shell resources
   "+grit/shell_resources.h",
+
+  # The content_shell for aura must work with the views and aura
+  "+ui/aura",
+  "+ui/views",
 ]

content/shell/shell.h

@@ -24,6 +24,16 @@
 typedef struct _GtkToolItem GtkToolItem;
 #elif defined(OS_ANDROID)
 #include "base/android/scoped_java_ref.h"
+#elif defined(USE_AURA)
+namespace views {
+class Widget;
+class ViewsDelegate;
+}
+namespace aura {
+namespace client {
+class StackingClient;
+}
+}
 #endif
 
 class GURL;
@@ -195,6 +205,11 @@ class Shell : public WebContentsDelegate,
   int content_height_;
 #elif defined(OS_ANDROID)
   base::android::ScopedJavaGlobalRef<jobject> java_object_;
+#elif defined(USE_AURA)
+  static aura::client::StackingClient* stacking_client_;
+  static views::ViewsDelegate* views_delegate_;
+
+  views::Widget* window_widget_;
 #endif
 
   // A container of all the open windows. We use a vector so we can keep track

content/shell/shell_browser_main_parts.cc

@@ -108,6 +108,9 @@ bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code)  {
 }
 
 void ShellBrowserMainParts::PostMainMessageLoopRun() {
+#if defined(USE_AURA)
+  Shell::PlatformExit();
+#endif
   if (devtools_delegate_)
     devtools_delegate_->Stop();
   browser_context_.reset();

content/test/content_test_launcher.cc

@@ -132,10 +132,6 @@ class ContentTestLauncherDelegate : public test_launcher::TestLauncherDelegate {
 }  // namespace content
 
 int main(int argc, char** argv) {
-#if defined(USE_AURA)
-  LOG(INFO) << "content_browsertests not supported on aura yet.";
-  return 0;
-#endif
   content::ContentTestLauncherDelegate launcher_delegate;
   return test_launcher::LaunchTests(&launcher_delegate, argc, argv);
 }