Remove using the Shell desktop Window when we don't have an acceleated widget.

ui/aura/remote_root_window_host_win.cc

 // 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.
 
 #include "ui/aura/remote_root_window_host_win.h"
 
 #include <windows.h>
 
 #include <algorithm>
 
@@ skipping 90 matching lines @@
                         const FileSelectionCanceled& on_failure) {
   DCHECK(aura::RemoteRootWindowHostWin::Instance());
   aura::RemoteRootWindowHostWin::Instance()->HandleSelectFolder(title,
                                                                 on_success,
                                                                 on_failure);
 }
 
 RemoteRootWindowHostWin* g_instance = NULL;
 
 RemoteRootWindowHostWin* RemoteRootWindowHostWin::Instance() {
-  return g_instance;
+  if (g_instance)
+    return g_instance;
+  return Create(gfx::Rect());
 }
 
 RemoteRootWindowHostWin* RemoteRootWindowHostWin::Create(
     const gfx::Rect& bounds) {
-  g_instance = new RemoteRootWindowHostWin(bounds);
+  g_instance = g_instance ? g_instance : new RemoteRootWindowHostWin(bounds);
   return g_instance;
 }
 
 RemoteRootWindowHostWin::RemoteRootWindowHostWin(const gfx::Rect& bounds)
-    : delegate_(NULL),
+    : remote_window_(NULL),
+      delegate_(NULL),
       host_(NULL),
       ignore_mouse_moves_until_set_cursor_ack_(false) {
   prop_.reset(new ui::ViewProp(NULL, kRootWindowHostWinKey, this));
 }
 
 RemoteRootWindowHostWin::~RemoteRootWindowHostWin() {
+  g_instance = NULL;
 }
 
-void RemoteRootWindowHostWin::Connected(IPC::Sender* host) {
+void RemoteRootWindowHostWin::Connected(IPC::Sender* host, HWND remote_window) {
   CHECK(host_ == NULL);
   host_ = host;
+  remote_window_ = remote_window;
 }
 
 void RemoteRootWindowHostWin::Disconnected() {
   CHECK(host_ != NULL);
   host_ = NULL;
+  remote_window_ = NULL;
 }
 
 bool RemoteRootWindowHostWin::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(RemoteRootWindowHostWin, message)
     IPC_MESSAGE_HANDLER(MetroViewerHostMsg_MouseMoved, OnMouseMoved)
     IPC_MESSAGE_HANDLER(MetroViewerHostMsg_MouseButton, OnMouseButton)
     IPC_MESSAGE_HANDLER(MetroViewerHostMsg_KeyDown, OnKeyDown)
     IPC_MESSAGE_HANDLER(MetroViewerHostMsg_KeyUp, OnKeyUp)
     IPC_MESSAGE_HANDLER(MetroViewerHostMsg_Character, OnChar)
@@ skipping 116 matching lines @@
 
 void RemoteRootWindowHostWin::SetDelegate(RootWindowHostDelegate* delegate) {
   delegate_ = delegate;
 }
 
 RootWindow* RemoteRootWindowHostWin::GetRootWindow() {
   return delegate_->AsRootWindow();
 }
 
 gfx::AcceleratedWidget RemoteRootWindowHostWin::GetAcceleratedWidget() {
-  // TODO(cpu): This is bad. Chrome's compositor needs a valid window
-  // initially and then later on we swap it. Since the compositor never
-  // uses this initial window we tell ourselves this hack is ok to get
-  // thing off the ground.
+  if (remote_window_)
+    return remote_window_;
+  // Getting here should only happen for ash_unittests.exe and related code.
   return ::GetDesktopWindow();
 }
 
 void RemoteRootWindowHostWin::Show() {
 }
 
 void RemoteRootWindowHostWin::Hide() {
   NOTIMPLEMENTED();
 }
 
@@ skipping 281 matching lines @@
   } else {
     ui::KeyEvent event(type,
                        ui::KeyboardCodeForWindowsKeyCode(vkey),
                        flags,
                        is_character);
     delegate_->OnHostKeyEvent(&event);
   }
 }
 
 }  // namespace aura