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

For Windows Ash (metro mode) we did not had timely access to the
real window (aka 'core window') so to keep the compositor from CHECKIing
we gave the shell desktop Window when it wanted a window here

RootWindow::RootWindow(const CreateParams& params) {
  ...
  compositor_.reset(new ui::Compositor(this, host_->GetAcceleratedWidget())); 
 ...
}

This was called from:
ash::DisplayController::AddRootWindowForDisplay
ash::DisplayController::InitPrimaryDisplay
ash::Shell::Init

Because ash was always created. Later on when the viewer process had started
it sends an IPC back with the core window which set the real window with 

void ChromeMetroViewerProcessHost::OnSetTargetSurface(..) {
  scoped_refptr<AcceleratedPresenter> any_window =
      AcceleratedPresenter::GetForWindow(NULL);
  any_window->SetNewTargetWindow(hwnd);
  ....
}

All this hackery can go away because now Ash starts on demand
once the aforementioned IPC arrives.

BUG=none
TEST=chromes starts in metro mode.

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

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

2 files changed, 0 insertions, 19 deletions

diff --git a/ui/surface/accelerated_surface_win.cc b/ui/surface/accelerated_surface_win.cc
index 2ec6382..0a6adcb 100644
--- a/ui/surface/accelerated_surface_win.cc
+++ b/ui/surface/accelerated_surface_win.cc
@@ -332,12 +332,6 @@ void AcceleratedPresenterMap::RemovePresenter(
 scoped_refptr<AcceleratedPresenter> AcceleratedPresenterMap::GetPresenter(
     gfx::PluginWindowHandle window) {
   base::AutoLock locked(lock_);
-
-#if defined(USE_AURA)
-  if (!window)
-    return presenters_.begin()->second;
-#endif
-
   PresenterMap::iterator it = presenters_.find(window);
   if (it == presenters_.end())
     return scoped_refptr<AcceleratedPresenter>();
@@ -672,13 +666,6 @@ void AcceleratedPresenter::ResetPresentThread(
   quantized_size_ = gfx::Size();
 }
 
-#if defined(USE_AURA)
-void AcceleratedPresenter::SetNewTargetWindow(gfx::PluginWindowHandle window) {
-  window_ = window;
-  swap_chain_ = NULL;
-}
-#endif
-
 AcceleratedPresenter::~AcceleratedPresenter() {
 }
 
diff --git a/ui/surface/accelerated_surface_win.h b/ui/surface/accelerated_surface_win.h
index 357fff3..110e206 100644
--- a/ui/surface/accelerated_surface_win.h
+++ b/ui/surface/accelerated_surface_win.h
@@ -89,12 +89,6 @@ class SURFACE_EXPORT AcceleratedPresenter
   // the given present thread.
   void ResetPresentThread(PresentThread* present_thread);
 
-#if defined(USE_AURA)
-  // TODO(scottmg): This is a temporary hack until we have a two-worlds ash/aura
-  // separation.
-  void SetNewTargetWindow(gfx::PluginWindowHandle window);
-#endif
-
  private:
   friend class base::RefCountedThreadSafe<AcceleratedPresenter>;