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

Unified Diff: mojo/shell/application_manager.h

Issue 1228743002: Mandoline: Move ContentHandlerConnection into separate file (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix build Created 5 years, 5 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 | « mojo/shell/BUILD.gn ('k') | mojo/shell/application_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/shell/application_manager.h
diff --git a/mojo/shell/application_manager.h b/mojo/shell/application_manager.h
index 727b9e6e8c523abe187cd9a786da6d69bcf4c802..5733b6b77f99c8f7f690958d02a56929da85ebb2 100644
--- a/mojo/shell/application_manager.h
+++ b/mojo/shell/application_manager.h
@@ -31,6 +31,7 @@ class SequencedWorkerPool;
namespace mojo {
namespace shell {
+class ContentHandlerConnection;
class ShellImpl;
class ApplicationManager {
@@ -76,11 +77,14 @@ class ApplicationManager {
~ApplicationManager();
// Loads a service if necessary and establishes a new client connection.
- void ConnectToApplication(mojo::URLRequestPtr application_url,
- const GURL& requestor_url,
- InterfaceRequest<ServiceProvider> services,
- ServiceProviderPtr exposed_services,
- const base::Closure& on_application_end);
+ void ConnectToApplication(
+ mojo::URLRequestPtr requested_url,
+ const std::string& qualifier,
+ const GURL& requestor_url,
+ InterfaceRequest<ServiceProvider> services,
+ ServiceProviderPtr exposed_services,
+ const base::Closure& on_application_end);
+
template <typename Interface>
inline void ConnectToService(const GURL& application_url,
@@ -143,9 +147,11 @@ class ApplicationManager {
// Removes a ShellImpl when it encounters an error.
void OnShellImplError(ShellImpl* shell_impl);
- private:
- class ContentHandlerConnection;
+ // Removes a ContentHandler when its connection is closed.
+ void OnContentHandlerConnectionClosed(
+ ContentHandlerConnection* content_handler);
+ private:
using ApplicationPackagedAlias = std::map<GURL, std::pair<GURL, std::string>>;
using IdentityToShellImplMap = std::map<Identity, ShellImpl*>;
using MimeTypeToURLMap = std::map<std::string, GURL>;
@@ -155,14 +161,6 @@ class ApplicationManager {
using URLToLoaderMap = std::map<GURL, ApplicationLoader*>;
using URLToNativeOptionsMap = std::map<GURL, NativeRunnerFactory::Options>;
- void ConnectToApplicationInternal(
- mojo::URLRequestPtr requested_url,
- const std::string& qualifier,
- const GURL& requestor_url,
- InterfaceRequest<ServiceProvider> services,
- ServiceProviderPtr exposed_services,
- const base::Closure& on_application_end);
-
bool ConnectToRunningApplication(const GURL& resolved_url,
const std::string& qualifier,
const GURL& requestor_url,
@@ -223,9 +221,6 @@ class ApplicationManager {
// configured for the URL.
ApplicationLoader* GetLoaderForURL(const GURL& url);
- // Removes a ContentHandler when it encounters an error.
- void OnContentHandlerError(ContentHandlerConnection* content_handler);
-
void CleanupRunner(NativeRunner* runner);
Delegate* const delegate_;
« no previous file with comments | « mojo/shell/BUILD.gn ('k') | mojo/shell/application_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698