Resolved some start up errors and added shell for Aura.

BUG=97131
TEST=none


Review URL: http://codereview.chromium.org/8162011

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

3 files changed, 6 insertions, 103 deletions

diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index db563bc..44e8770 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -1365,7 +1365,9 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunInternal() {
   // just changed it to include experiments.
   child_process_logging::SetCommandLine(CommandLine::ForCurrentProcess());
 
-#if defined(TOOLKIT_VIEWS)
+#if defined(USE_AURA)
+  browser::InitAuraDesktop();
+#elif defined(TOOLKIT_VIEWS)
   views::Widget::SetPureViews(
       CommandLine::ForCurrentProcess()->HasSwitch(switches::kUsePureViews));
   // Launch the views desktop shell window and register it as the default parent
@@ -1389,9 +1391,6 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunInternal() {
     }
   }
 #endif
-#if defined(USE_AURA)
-  browser::InitAuraDesktop();
-#endif
 
   InitializeNetworkOptions(parsed_command_line());
   InitializeURLRequestThrottlerManager(browser_process_->net_log());
diff --git a/chrome/browser/ui/views/aura/aura_init.cc b/chrome/browser/ui/views/aura/aura_init.cc
index d5cf9df..571176c 100644
--- a/chrome/browser/ui/views/aura/aura_init.cc
+++ b/chrome/browser/ui/views/aura/aura_init.cc
@@ -4,108 +4,12 @@
 
 #include "chrome/browser/ui/views/aura/aura_init.h"
 
-#include "chrome/browser/ui/views/chrome_views_delegate.h"
-#include "ui/aura/desktop.h"
-#include "ui/aura/hit_test.h"
-#include "ui/aura/window_delegate.h"
-#include "ui/gfx/canvas_skia.h"
-#include "views/view.h"
-#include "views/widget/widget.h"
+#include "ui/aura_shell/shell_factory.h"
 
 namespace browser {
 
-namespace {
-
-// Trivial WindowDelegate implementation that draws a colored background.
-class DemoWindowDelegate : public aura::WindowDelegate {
- public:
-  explicit DemoWindowDelegate(SkColor color) : color_(color) {}
-
-  // Overridden from aura::WindowDelegate:
-  virtual void OnBoundsChanged(const gfx::Rect& old_bounds,
-                               const gfx::Rect& new_bounds) OVERRIDE {}
-  virtual void OnFocus() OVERRIDE {}
-  virtual void OnBlur() OVERRIDE {}
-  virtual bool OnKeyEvent(aura::KeyEvent* event) OVERRIDE {
-    return false;
-  }
-  virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE {
-    return NULL;
-  }
-  virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE {
-    return HTCLIENT;
-  }
-  virtual bool OnMouseEvent(aura::MouseEvent* event) OVERRIDE {
-    return true;
-  }
-  virtual bool ShouldActivate(aura::MouseEvent* event) OVERRIDE {
-    return true;
-  }
-  virtual void OnActivated() OVERRIDE {
-  }
-  virtual void OnLostActive() OVERRIDE {
-  }
-  virtual void OnCaptureLost() OVERRIDE {
-  }
-  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
-    canvas->GetSkCanvas()->drawColor(color_, SkXfermode::kSrc_Mode);
-  }
-  virtual void OnWindowDestroying() OVERRIDE {
-  }
-  virtual void OnWindowDestroyed() OVERRIDE {
-    delete this;
-  }
-
- private:
-  SkColor color_;
-
-  DISALLOW_COPY_AND_ASSIGN(DemoWindowDelegate);
-};
-
-
-class TestView : public views::View {
- public:
-  TestView() {}
-  virtual ~TestView() {}
-
-  virtual void OnPaint(gfx::Canvas* canvas) {
-    canvas->FillRectInt(SK_ColorRED, 0, 0, width(), height());
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(TestView);
-};
-
-}  // namespace
-
 void InitAuraDesktop() {
-  aura::Desktop::GetInstance();
-  views::Widget* widget = new views::Widget;
-  views::Widget::InitParams params(views::Widget::InitParams::TYPE_CONTROL);
-  params.bounds = gfx::Rect(0, 0, 1024, 768);
-  widget->Init(params);
-  widget->SetContentsView(new views::View);
-  widget->Show();
-  ChromeViewsDelegate* chrome_views_delegate =
-      static_cast<ChromeViewsDelegate*>(views::ViewsDelegate::views_delegate);
-  chrome_views_delegate->default_parent_view = widget->GetContentsView();
-  aura::Desktop::GetInstance()->Show();
-
-  views::Widget* widget2 = new views::Widget;
-  views::Widget::InitParams params2(views::Widget::InitParams::TYPE_CONTROL);
-  params2.bounds = gfx::Rect(75, 75, 80, 80);
-  params2.parent = aura::Desktop::GetInstance()->window();
-  widget2->Init(params2);
-  widget2->SetContentsView(new TestView);
-  widget2->Show();
-
-  DemoWindowDelegate* window_delegate1 = new DemoWindowDelegate(SK_ColorBLUE);
-  aura::Window* window1 = new aura::Window(window_delegate1);
-  window1->set_id(1);
-  window1->Init();
-  window1->SetBounds(gfx::Rect(100, 100, 400, 400));
-  window1->Show();
-  window1->SetParent(NULL);
+  aura_shell::InitDesktopWindow();
 }
 
 }  // namespace browser
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 1f41d62..7a98359 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -4134,7 +4134,7 @@
             ['include', '^browser/ui/views/simple_message_box_views.h'],
           ],
           'dependencies': [
-            '../ui/aura/aura.gyp:aura',
+            '../ui/aura_shell/aura_shell.gyp:aura_shell',
           ],
         }],
         ['use_virtual_keyboard==0', {