| Index: apps/shell/app/shell_main_delegate.cc
|
| diff --git a/apps/shell/app/shell_main_delegate.cc b/apps/shell/app/shell_main_delegate.cc
|
| index 13706cda47a78edcf9960e4953b1c0c3a6a0e880..b8f835d1ae84a3e6177c0afabded275a1b090ed9 100644
|
| --- a/apps/shell/app/shell_main_delegate.cc
|
| +++ b/apps/shell/app/shell_main_delegate.cc
|
| @@ -4,6 +4,7 @@
|
|
|
| #include "apps/shell/app/shell_main_delegate.h"
|
|
|
| +#include "apps/shell/browser/default_shell_browser_main_delegate.h"
|
| #include "apps/shell/browser/shell_content_browser_client.h"
|
| #include "apps/shell/common/shell_content_client.h"
|
| #include "apps/shell/renderer/shell_content_renderer_client.h"
|
| @@ -65,7 +66,8 @@ void ShellMainDelegate::PreSandboxStartup() {
|
| }
|
|
|
| content::ContentBrowserClient* ShellMainDelegate::CreateContentBrowserClient() {
|
| - browser_client_.reset(new apps::ShellContentBrowserClient);
|
| + browser_client_.reset(
|
| + new apps::ShellContentBrowserClient(CreateShellBrowserMainDelegate()));
|
| return browser_client_.get();
|
| }
|
|
|
| @@ -75,6 +77,10 @@ ShellMainDelegate::CreateContentRendererClient() {
|
| return renderer_client_.get();
|
| }
|
|
|
| +ShellBrowserMainDelegate* ShellMainDelegate::CreateShellBrowserMainDelegate() {
|
| + return new DefaultShellBrowserMainDelegate();
|
| +}
|
| +
|
| // static
|
| bool ShellMainDelegate::ProcessNeedsResourceBundle(
|
| const std::string& process_type) {
|
|
|