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

Side by Side Diff: ui/views_content_client/views_content_browser_client.cc

Issue 284113011: Repurpose views+content example into a generic multiprocess views runtime (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase for horrible copyright header change in revert CL Created 6 years, 7 months 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ui/views/examples/content_client/examples_content_browser_client.h" 5 #include "ui/views_content_client/views_content_browser_client.h"
6 6
7 #include "content/shell/browser/shell_browser_context.h" 7 #include "content/shell/browser/shell_browser_context.h"
8 #include "ui/views/examples/content_client/examples_browser_main_parts.h" 8 #include "ui/views_content_client/views_content_client_main_parts.h"
9 9
10 namespace views { 10 namespace ui {
11 namespace examples {
12 11
13 ExamplesContentBrowserClient::ExamplesContentBrowserClient() 12 ViewsContentBrowserClient::ViewsContentBrowserClient(
14 : examples_browser_main_parts_(NULL) { 13 ViewsContentClient* views_content_client)
14 : views_content_main_parts_(NULL),
15 views_content_client_(views_content_client) {
15 } 16 }
16 17
17 ExamplesContentBrowserClient::~ExamplesContentBrowserClient() { 18 ViewsContentBrowserClient::~ViewsContentBrowserClient() {
18 } 19 }
19 20
20 content::BrowserMainParts* ExamplesContentBrowserClient::CreateBrowserMainParts( 21 content::BrowserMainParts* ViewsContentBrowserClient::CreateBrowserMainParts(
21 const content::MainFunctionParams& parameters) { 22 const content::MainFunctionParams& parameters) {
22 examples_browser_main_parts_ = new ExamplesBrowserMainParts(parameters); 23 views_content_main_parts_ =
23 return examples_browser_main_parts_; 24 new ViewsContentClientMainParts(parameters, views_content_client_);
25 return views_content_main_parts_;
24 } 26 }
25 27
26 net::URLRequestContextGetter* 28 net::URLRequestContextGetter*
27 ExamplesContentBrowserClient::CreateRequestContext( 29 ViewsContentBrowserClient::CreateRequestContext(
28 content::BrowserContext* content_browser_context, 30 content::BrowserContext* content_browser_context,
29 content::ProtocolHandlerMap* protocol_handlers, 31 content::ProtocolHandlerMap* protocol_handlers,
30 content::ProtocolHandlerScopedVector protocol_interceptors) { 32 content::ProtocolHandlerScopedVector protocol_interceptors) {
31 content::ShellBrowserContext* shell_context = 33 content::ShellBrowserContext* shell_context =
32 examples_browser_main_parts_->browser_context(); 34 views_content_main_parts_->browser_context();
33 return shell_context->CreateRequestContext(protocol_handlers, 35 return shell_context->CreateRequestContext(protocol_handlers,
34 protocol_interceptors.Pass()); 36 protocol_interceptors.Pass());
35 } 37 }
36 38
37 } // namespace examples 39 } // namespace ui
38 } // namespace views
OLDNEW
« no previous file with comments | « ui/views_content_client/views_content_browser_client.h ('k') | ui/views_content_client/views_content_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698