| Index: chrome/browser/chrome_browser_main.cc
|
| ===================================================================
|
| --- chrome/browser/chrome_browser_main.cc (revision 104542)
|
| +++ chrome/browser/chrome_browser_main.cc (working copy)
|
| @@ -201,9 +201,7 @@
|
| #endif
|
|
|
| #if defined(USE_AURA)
|
| -#include "ui/aura/desktop.h"
|
| -#include "ui/aura_shell/shell_factory.h"
|
| -#include "ui/aura/desktop.h"
|
| +#include "ui/aura_shell/shell.h"
|
| #endif
|
|
|
| namespace net {
|
| @@ -1368,7 +1366,8 @@
|
| child_process_logging::SetCommandLine(CommandLine::ForCurrentProcess());
|
|
|
| #if defined(USE_AURA)
|
| - aura_shell::InitDesktopWindow();
|
| + aura_shell::Shell shell;
|
| + shell.Init();
|
| #elif defined(TOOLKIT_VIEWS)
|
| views::Widget::SetPureViews(
|
| CommandLine::ForCurrentProcess()->HasSwitch(switches::kUsePureViews));
|
|
|