| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/shell/shell_content_browser_client.h" | 5 #include "content/shell/shell_content_browser_client.h" |
| 6 | 6 |
| 7 #include "base/file_path.h" | 7 #include "base/file_path.h" |
| 8 #include "content/browser/webui/empty_web_ui_factory.h" | 8 #include "content/browser/webui/empty_web_ui_factory.h" |
| 9 #include "content/shell/shell.h" | 9 #include "content/shell/shell.h" |
| 10 #include "content/shell/shell_browser_main.h" | 10 #include "content/shell/shell_browser_main.h" |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 | 21 |
| 22 namespace content { | 22 namespace content { |
| 23 | 23 |
| 24 ShellContentBrowserClient::ShellContentBrowserClient() | 24 ShellContentBrowserClient::ShellContentBrowserClient() |
| 25 : shell_browser_main_parts_(NULL) { | 25 : shell_browser_main_parts_(NULL) { |
| 26 } | 26 } |
| 27 | 27 |
| 28 ShellContentBrowserClient::~ShellContentBrowserClient() { | 28 ShellContentBrowserClient::~ShellContentBrowserClient() { |
| 29 } | 29 } |
| 30 | 30 |
| 31 BrowserMainParts* ShellContentBrowserClient::CreateBrowserMainParts( | 31 void ShellContentBrowserClient::CreateBrowserMainParts( |
| 32 const MainFunctionParams& parameters) { | 32 const MainFunctionParams& parameters, |
| 33 return new ShellBrowserMainParts(parameters); | 33 std::vector<BrowserMainParts*>* parts_list) { |
| 34 parts_list->push_back(new ShellBrowserMainParts(parameters)); |
| 34 } | 35 } |
| 35 | 36 |
| 36 RenderWidgetHostView* ShellContentBrowserClient::CreateViewForWidget( | 37 RenderWidgetHostView* ShellContentBrowserClient::CreateViewForWidget( |
| 37 RenderWidgetHost* widget) { | 38 RenderWidgetHost* widget) { |
| 38 #if defined(OS_WIN) | 39 #if defined(OS_WIN) |
| 39 return new RenderWidgetHostViewWin(widget); | 40 return new RenderWidgetHostViewWin(widget); |
| 40 #else | 41 #else |
| 41 return NULL; | 42 return NULL; |
| 42 #endif | 43 #endif |
| 43 } | 44 } |
| (...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 320 tab_contents_view->tab_contents()->browser_context(), | 321 tab_contents_view->tab_contents()->browser_context(), |
| 321 GURL(), | 322 GURL(), |
| 322 tab_contents_view->tab_contents()->GetSiteInstance(), | 323 tab_contents_view->tab_contents()->GetSiteInstance(), |
| 323 route_id, | 324 route_id, |
| 324 tab_contents_view->tab_contents()); | 325 tab_contents_view->tab_contents()); |
| 325 return shell->tab_contents(); | 326 return shell->tab_contents(); |
| 326 } | 327 } |
| 327 #endif | 328 #endif |
| 328 | 329 |
| 329 } // namespace content | 330 } // namespace content |
| OLD | NEW |