trying to fix start err

GnorTech · rogerwang · commit d9a1fe2f8d10 · 2014-06-18T10:42:01.000+08:00
diff --git a/nw.gypi b/nw.gypi
@@ -339,6 +339,13 @@
             '<(DEPTH)/base/allocator/allocator.gyp:allocator',
           ],
         }],
+        ['use_aura==1', {
+          'dependencies': [
+            '<(DEPTH)/ui/views/views.gyp:views',
+            '<(DEPTH)/ui/views/views.gyp:views_test_support',
+            '<(DEPTH)/ui/views/controls/webview/webview.gyp:webview',
+          ],
+        }],
         ['(os_posix==1 and OS != "mac" and linux_use_tcmalloc==1)', {
           'dependencies': [
             # This is needed by content/app/content_main_runner.cc
diff --git a/src/browser/native_window_win.cc b/src/browser/native_window_win.cc
@@ -276,6 +276,7 @@ NativeWindowWin::NativeWindowWin(const base::WeakPtr<content::Shell>& shell,
   window_ = new views::Widget;
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
   params.delegate = this;
+  params.top_level = true;
   params.remove_standard_frame = !has_frame();
   params.use_system_default_icon = true;
   window_->Init(params);
diff --git a/src/shell_browser_main_parts.cc b/src/shell_browser_main_parts.cc
@@ -52,6 +52,13 @@
 #include "content/nw/src/browser/printing/print_dialog_gtk.h"
 #endif
 
+#if defined(USE_AURA)
+#include "ui/aura/env.h"
+#include "ui/gfx/screen.h"
+#include "ui/views/test/desktop_test_views_delegate.h"
+#include "ui/views/widget/desktop_aura/desktop_screen.h"
+#endif  // defined(USE_AURA)
+
 using base::MessageLoop;
 
 namespace {
@@ -149,9 +156,29 @@ void ShellBrowserMainParts::PostMainMessageLoopStart() {
 
 int ShellBrowserMainParts::PreCreateThreads() {
   net::ProxyResolverV8::RememberDefaultIsolate();
+#if defined(USE_AURA)
+  gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE,
+                                 views::CreateDesktopScreen());
+#endif
   return 0;
 }
 
+void ShellBrowserMainParts::PostDestroyThreads() {
+#if defined(USE_AURA)
+  aura::Env::DeleteInstance();
+  delete views::ViewsDelegate::views_delegate;
+#endif
+}
+
+void ShellBrowserMainParts::ToolkitInitialized() {
+#if defined(USE_AURA)
+  aura::Env::CreateInstance();
+
+  DCHECK(!views::ViewsDelegate::views_delegate);
+  new views::DesktopTestViewsDelegate;
+#endif
+}
+
 void ShellBrowserMainParts::Init() {
   package_.reset(new nw::Package());
   CommandLine& command_line = *CommandLine::ForCurrentProcess();
diff --git a/src/shell_browser_main_parts.h b/src/shell_browser_main_parts.h
@@ -47,7 +47,9 @@ class ShellBrowserMainParts : public BrowserMainParts {
   virtual void PostMainMessageLoopStart() OVERRIDE;
   virtual bool MainMessageLoopRun(int* result_code) OVERRIDE;
   virtual void PostMainMessageLoopRun() OVERRIDE;
-  virtual int PreCreateThreads() OVERRIDE;
+  virtual int  PreCreateThreads() OVERRIDE;
+  virtual void PostDestroyThreads() OVERRIDE;
+  virtual void ToolkitInitialized() OVERRIDE;
 
   // Init browser context and every thing
   void Init();
