Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(239)

Side by Side Diff: content/shell/shell_content_browser_client.cc

Issue 8539038: Add ChromeBrowserMainExtraParts for non main parts. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase again + explicit reset of parts_ Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/shell/shell_content_browser_client.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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 void ShellContentBrowserClient::CreateBrowserMainParts( 31 BrowserMainParts* ShellContentBrowserClient::CreateBrowserMainParts(
32 const content::MainFunctionParams& parameters, 32 const content::MainFunctionParams& parameters) {
33 std::vector<BrowserMainParts*>* parts_list) { 33 return new ShellBrowserMainParts(parameters);
34 parts_list->push_back(new ShellBrowserMainParts(parameters));
35 } 34 }
36 35
37 RenderWidgetHostView* ShellContentBrowserClient::CreateViewForWidget( 36 RenderWidgetHostView* ShellContentBrowserClient::CreateViewForWidget(
38 RenderWidgetHost* widget) { 37 RenderWidgetHost* widget) {
39 #if defined(OS_WIN) 38 #if defined(OS_WIN)
40 return new RenderWidgetHostViewWin(widget); 39 return new RenderWidgetHostViewWin(widget);
41 #else 40 #else
42 return NULL; 41 return NULL;
43 #endif 42 #endif
44 } 43 }
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 tab_contents_view->tab_contents()->browser_context(), 341 tab_contents_view->tab_contents()->browser_context(),
343 GURL(), 342 GURL(),
344 tab_contents_view->tab_contents()->GetSiteInstance(), 343 tab_contents_view->tab_contents()->GetSiteInstance(),
345 route_id, 344 route_id,
346 tab_contents_view->tab_contents()); 345 tab_contents_view->tab_contents());
347 return shell->tab_contents(); 346 return shell->tab_contents();
348 } 347 }
349 #endif 348 #endif
350 349
351 } // namespace content 350 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/shell_content_browser_client.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698