Make win_aura work without ash.

ui/views/examples/content_client/examples_browser_main_parts.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/views/examples/content_client/examples_browser_main_parts.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "content/public/common/content_switches.h"
 #include "content/shell/shell.h"
 #include "content/shell/shell_browser_context.h"
 #include "content/shell/shell_devtools_delegate.h"
 #include "content/shell/shell_switches.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_module.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/views/examples/examples_window.h"
 #include "ui/views/test/test_views_delegate.h"
 #include "ui/views/focus/accelerator_handler.h"
 
 #if defined(USE_AURA)
-#if !defined(USE_ASH)
 #include "ui/aura/single_monitor_manager.h"
-#include "ui/views/widget/desktop_native_widget_helper_aura.h"
-#endif
+#include "ui/aura/desktop/desktop_screen.h"
 #include "ui/aura/desktop/desktop_stacking_client.h"
 #include "ui/aura/env.h"
+#include "ui/gfx/screen.h"
+#include "ui/views/widget/desktop_native_widget_helper_aura.h"
 #include "ui/views/widget/native_widget_aura.h"
 #endif
 
 namespace views {
 namespace examples {
 
 namespace {
 class ExamplesViewsDelegate : public views::TestViewsDelegate {
  public:
-#if defined(USE_AURA) && !defined(USE_ASH)
+#if defined(USE_AURA)
   virtual views::NativeWidgetHelperAura* CreateNativeWidgetHelper(
       views::NativeWidgetAura* native_widget) OVERRIDE {
     return new views::DesktopNativeWidgetHelperAura(native_widget);
   }
-#endif  // !USE_ASH
+#endif
 };
 }  // namespace
 
 ExamplesBrowserMainParts::ExamplesBrowserMainParts(
     const content::MainFunctionParams& parameters)
     : BrowserMainParts(),
       devtools_delegate_(NULL) {
 }
 
 ExamplesBrowserMainParts::~ExamplesBrowserMainParts() {
 }
 
 #if !defined(OS_MACOSX)
 void ExamplesBrowserMainParts::PreMainMessageLoopStart() {
 }
 #endif
 
 int ExamplesBrowserMainParts::PreCreateThreads() {
   return 0;
 }
 
 void ExamplesBrowserMainParts::PreMainMessageLoopRun() {
   browser_context_.reset(new content::ShellBrowserContext);
 
 #if defined(USE_AURA)
-#if !defined(USE_ASH)
   aura::Env::GetInstance()->SetMonitorManager(new aura::SingleMonitorManager);
-#endif
   stacking_client_.reset(new aura::DesktopStackingClient);
+  gfx::Screen::SetInstance(aura::CreateDesktopScreen());
 #endif
   views_delegate_.reset(new ExamplesViewsDelegate);
 
   views::examples::ShowExamplesWindow(views::examples::QUIT_ON_CLOSE,
                                       browser_context_.get());
 }
 
 void ExamplesBrowserMainParts::PostMainMessageLoopRun() {
   if (devtools_delegate_)
     devtools_delegate_->Stop();
@@ skipping 17 matching lines @@
 }
 
 ui::Clipboard* ExamplesBrowserMainParts::GetClipboard() {
   if (!clipboard_.get())
     clipboard_.reset(new ui::Clipboard());
   return clipboard_.get();
 }
 
 }  // namespace examples
 }  // namespace views