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

Unified Diff: content/browser/mojo/mojo_shell_context.h

Issue 1343823002: Revert of Move fetching logic out of ApplicationManager, eliminate url mappings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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
« no previous file with comments | « content/browser/BUILD.gn ('k') | content/browser/mojo/mojo_shell_context.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/mojo/mojo_shell_context.h
diff --git a/content/browser/mojo/mojo_shell_context.h b/content/browser/mojo/mojo_shell_context.h
index b838781837b6038133f240226f0636d2aa59347e..897c01bb9ac4db5d1a6e7d29f60fd5627d826c48 100644
--- a/content/browser/mojo/mojo_shell_context.h
+++ b/content/browser/mojo/mojo_shell_context.h
@@ -26,13 +26,14 @@
// MojoShellContext hosts the browser's ApplicationManager, coordinating
// app registration and interconnection.
-class CONTENT_EXPORT MojoShellContext {
+class CONTENT_EXPORT MojoShellContext
+ : public NON_EXPORTED_BASE(mojo::shell::ApplicationManager::Delegate) {
public:
using StaticApplicationMap =
std::map<GURL, base::Callback<scoped_ptr<mojo::ApplicationDelegate>()>>;
MojoShellContext();
- ~MojoShellContext();
+ ~MojoShellContext() override;
// Connects an application at |url| and gets a handle to its exposed services.
// This is only intended for use in browser code that's not part of some Mojo
@@ -60,6 +61,13 @@
const mojo::shell::CapabilityFilter& filter,
const mojo::Shell::ConnectToApplicationCallback& callback);
+ // mojo::shell::ApplicationManager::Delegate:
+ GURL ResolveMappings(const GURL& url) override;
+ GURL ResolveMojoURL(const GURL& url) override;
+ bool CreateFetcher(
+ const GURL& url,
+ const mojo::shell::Fetcher::FetchCallback& loader_callback) override;
+
static base::LazyInstance<scoped_ptr<Proxy>> proxy_;
scoped_ptr<mojo::shell::ApplicationManager> application_manager_;
« no previous file with comments | « content/browser/BUILD.gn ('k') | content/browser/mojo/mojo_shell_context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698