1 files changed, 81 insertions, 3 deletions
diff --git a/chromium/ui/views/examples/examples_main.cc b/chromium/ui/views/examples/examples_main.cc
index 28864c477c8..4dc9fbec153 100644
--- a/chromium/ui/views/examples/examples_main.cc
+++ b/chromium/ui/views/examples/examples_main.cc
@@ -4,16 +4,94 @@
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
+#include "base/files/file_path.h"
+#include "base/i18n/icu_util.h"
 #include "base/message_loop/message_loop.h"
+#include "base/path_service.h"
 #include "base/run_loop.h"
+#include "ui/aura/env.h"
+#include "ui/base/ime/input_method_initializer.h"
+#include "ui/base/resource/resource_bundle.h"
+#include "ui/base/ui_base_paths.h"
+#include "ui/compositor/test/in_process_context_factory.h"
+#include "ui/gfx/screen.h"
+#include "ui/gl/gl_surface.h"
+#include "ui/views/examples/example_base.h"
+#include "ui/views/examples/examples_window.h"
+#include "ui/views/test/desktop_test_views_delegate.h"
+#include "ui/wm/core/wm_state.h"
+
+#if !defined(OS_CHROMEOS)
+#include "ui/views/widget/desktop_aura/desktop_screen.h"
+#endif
+
+#if defined(OS_WIN)
+#include "ui/base/win/scoped_ole_initializer.h"
+#endif
+
+#if defined(USE_X11)
+#include "ui/gfx/x/x11_connection.h"
+#endif
 
 int main(int argc, char** argv) {
-  base::AtExitManager at_exit;
+#if defined(OS_WIN)
+  ui::ScopedOleInitializer ole_initializer_;
+#endif
+
   CommandLine::Init(argc, argv);
 
-  base::MessageLoop message_loop(base::MessageLoop::TYPE_UI);
+  base::AtExitManager at_exit;
+
+#if defined(USE_X11)
+  // This demo uses InProcessContextFactory which uses X on a separate Gpu
+  // thread.
+  gfx::InitializeThreadedX11();
+#endif
+
+  gfx::GLSurface::InitializeOneOff();
+
+  // The ContextFactory must exist before any Compositors are created.
+  scoped_ptr<ui::InProcessContextFactory> context_factory(
+      new ui::InProcessContextFactory());
+
+  base::MessageLoopForUI message_loop;
+
+  base::i18n::InitializeICU();
+
+  ui::RegisterPathProvider();
+
+  base::FilePath ui_test_pak_path;
+  DCHECK(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));
+  ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
+
+  aura::Env::CreateInstance(true);
+  aura::Env::GetInstance()->set_context_factory(context_factory.get());
+
+  ui::InitializeInputMethodForTesting();
+
+  {
+    views::DesktopTestViewsDelegate views_delegate;
+    wm::WMState wm_state;
+
+#if !defined(OS_CHROMEOS)
+    scoped_ptr<gfx::Screen> desktop_screen(views::CreateDesktopScreen());
+    gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE,
+                                   desktop_screen.get());
+#endif
+
+    views::examples::ShowExamplesWindow(
+        views::examples::QUIT_ON_CLOSE,
+        NULL,
+        scoped_ptr<ScopedVector<views::examples::ExampleBase> >());
+
+    base::RunLoop().Run();
+
+    ui::ResourceBundle::CleanupSharedInstance();
+  }
+
+  ui::ShutdownInputMethod();
 
-  base::RunLoop().Run();
+  aura::Env::DeleteInstance();
 
   return 0;
 }