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

Unified 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 side-by-side diff with in-line comments
Download patch
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 43%
rename from ui/views/examples/content_client/examples_content_browser_client.cc
rename to ui/views_content_client/views_content_browser_client.cc
index f7495243891c130de3018a8214529eb96cfb9b35..05d959177b3c951cb79abc52d5cba4c598d856cf 100644
--- a/ui/views/examples/content_client/examples_content_browser_client.cc
+++ b/ui/views_content_client/views_content_browser_client.cc
@@ -1,38 +1,39 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// 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
« 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