| Index: ui/aura_shell/aura_shell_main.cc
|
| ===================================================================
|
| --- ui/aura_shell/aura_shell_main.cc (revision 104542)
|
| +++ ui/aura_shell/aura_shell_main.cc (working copy)
|
| @@ -8,6 +8,7 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/message_loop.h"
|
| #include "ui/aura/desktop.h"
|
| +#include "ui/aura_shell/shell.h"
|
| #include "ui/aura_shell/shell_factory.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
| #include "ui/base/ui_base_paths.h"
|
| @@ -25,7 +26,8 @@
|
| // Create the message-loop here before creating the desktop.
|
| MessageLoop message_loop(MessageLoop::TYPE_UI);
|
|
|
| - aura_shell::InitDesktopWindow();
|
| + aura_shell::Shell shell;
|
| + shell.Init();
|
|
|
| aura_shell::examples::InitWindowTypeLauncher();
|
|
|
|
|