| Index: ui/views_content_client/views_content_browser_client.cc
|
| diff --git a/ui/views/examples/content_client/examples_content_browser_client.cc b/ui/views_content_client/views_content_browser_client.cc
|
| similarity index 48%
|
| rename from ui/views/examples/content_client/examples_content_browser_client.cc
|
| rename to ui/views_content_client/views_content_browser_client.cc
|
| index 6b3b9105ff404536c87b4e0eb895ea89f8b838de..05d959177b3c951cb79abc52d5cba4c598d856cf 100644
|
| --- a/ui/views/examples/content_client/examples_content_browser_client.cc
|
| +++ b/ui/views_content_client/views_content_browser_client.cc
|
| @@ -2,37 +2,38 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "ui/views/examples/content_client/examples_content_browser_client.h"
|
| +#include "ui/views_content_client/views_content_browser_client.h"
|
|
|
| #include "content/shell/browser/shell_browser_context.h"
|
| -#include "ui/views/examples/content_client/examples_browser_main_parts.h"
|
| +#include "ui/views_content_client/views_content_client_main_parts.h"
|
|
|
| -namespace views {
|
| -namespace examples {
|
| +namespace ui {
|
|
|
| -ExamplesContentBrowserClient::ExamplesContentBrowserClient()
|
| - : examples_browser_main_parts_(NULL) {
|
| +ViewsContentBrowserClient::ViewsContentBrowserClient(
|
| + ViewsContentClient* views_content_client)
|
| + : views_content_main_parts_(NULL),
|
| + views_content_client_(views_content_client) {
|
| }
|
|
|
| -ExamplesContentBrowserClient::~ExamplesContentBrowserClient() {
|
| +ViewsContentBrowserClient::~ViewsContentBrowserClient() {
|
| }
|
|
|
| -content::BrowserMainParts* ExamplesContentBrowserClient::CreateBrowserMainParts(
|
| +content::BrowserMainParts* ViewsContentBrowserClient::CreateBrowserMainParts(
|
| const content::MainFunctionParams& parameters) {
|
| - examples_browser_main_parts_ = new ExamplesBrowserMainParts(parameters);
|
| - return examples_browser_main_parts_;
|
| + views_content_main_parts_ =
|
| + new ViewsContentClientMainParts(parameters, views_content_client_);
|
| + return views_content_main_parts_;
|
| }
|
|
|
| net::URLRequestContextGetter*
|
| -ExamplesContentBrowserClient::CreateRequestContext(
|
| +ViewsContentBrowserClient::CreateRequestContext(
|
| content::BrowserContext* content_browser_context,
|
| content::ProtocolHandlerMap* protocol_handlers,
|
| content::ProtocolHandlerScopedVector protocol_interceptors) {
|
| content::ShellBrowserContext* shell_context =
|
| - examples_browser_main_parts_->browser_context();
|
| + views_content_main_parts_->browser_context();
|
| return shell_context->CreateRequestContext(protocol_handlers,
|
| protocol_interceptors.Pass());
|
| }
|
|
|
| -} // namespace examples
|
| -} // namespace views
|
| +} // namespace ui
|
|
|