| Index: extensions/shell/browser/shell_browser_main_parts.cc
|
| diff --git a/extensions/shell/browser/shell_browser_main_parts.cc b/extensions/shell/browser/shell_browser_main_parts.cc
|
| index 820f1b4430b6e1efdcdab977b02725fc4f34cf09..24f7e02858f031fdec1351a30bf946e5c236b9ba 100644
|
| --- a/extensions/shell/browser/shell_browser_main_parts.cc
|
| +++ b/extensions/shell/browser/shell_browser_main_parts.cc
|
| @@ -8,6 +8,7 @@
|
| #include "base/run_loop.h"
|
| #include "components/keyed_service/content/browser_context_dependency_manager.h"
|
| #include "components/omaha_query_params/omaha_query_params.h"
|
| +#include "content/public/browser/context_factory.h"
|
| #include "content/public/common/result_codes.h"
|
| #include "content/shell/browser/shell_devtools_delegate.h"
|
| #include "content/shell/browser/shell_net_log.h"
|
| @@ -22,6 +23,7 @@
|
| #include "extensions/shell/browser/shell_omaha_query_params_delegate.h"
|
| #include "extensions/shell/common/shell_extensions_client.h"
|
| #include "extensions/shell/common/switches.h"
|
| +#include "ui/aura/env.h"
|
| #include "ui/aura/window_tree_host.h"
|
| #include "ui/base/ime/input_method_initializer.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
| @@ -95,8 +97,9 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() {
|
| // Initialize our "profile" equivalent.
|
| browser_context_.reset(new ShellBrowserContext);
|
|
|
| + aura::Env::GetInstance()->set_context_factory(content::GetContextFactory());
|
| +
|
| desktop_controller_.reset(browser_main_delegate_->CreateDesktopController());
|
| - desktop_controller_->CreateRootWindow();
|
|
|
| // NOTE: Much of this is culled from chrome/test/base/chrome_test_suite.cc
|
| // TODO(jamescook): Initialize user_manager::UserManager.
|
|
|