commit f571318d3785f533acb7f2dd0f0e44f52d57903e
author James Robinson <jamesr@chromium.org> Tue Jan 13 17:41:34 2015 -0800
committer James Robinson <jamesr@chromium.org> Tue Jan 13 17:41:34 2015 -0800
tree be4111cb6d451ab253273e80b16c804511811acf
parent 29fd00acdefa17fcc97679d834dc60fa70a0d141

Move application_manager's ShellImpl to own file

This class will need modifications for the Application/Shell client
removal and it's awkward to modify it as an inner class in the cc file.
This moves it to its own .h/.cc without changing any functionality.

R=sky@chromium.org

Review URL: https://codereview.chromium.org/821123005

mojo/application_manager/application_manager.h

diff --git a/mojo/application_manager/application_manager.h b/mojo/application_manager/application_manager.h
index 0a8906a..f98f17a 100644
--- a/mojo/application_manager/application_manager.h
+++ b/mojo/application_manager/application_manager.h
@@ -14,6 +14,7 @@
 #include "base/memory/weak_ptr.h"
 #include "mojo/application_manager/application_loader.h"
 #include "mojo/application_manager/application_manager_export.h"
+#include "mojo/application_manager/shell_impl.h"
 #include "mojo/public/interfaces/application/service_provider.mojom.h"
 #include "url/gurl.h"
 
@@ -89,6 +90,9 @@
   // and have a chance to shutdown.
   void TerminateShellConnections();
 
+  // Removes a ShellImpl when it encounters an error.
+  void OnShellImplError(ShellImpl* shell_impl);
+
  private:
   enum IncludeDefaultLoader {
     INCLUDE_DEFAULT_LOADER,
@@ -96,7 +100,6 @@
   };
 
   class ContentHandlerConnection;
-  class ShellImpl;
 
   typedef std::map<std::string, ApplicationLoader*> SchemeToLoaderMap;
   typedef std::map<GURL, ApplicationLoader*> URLToLoaderMap;
@@ -124,9 +127,6 @@
   ApplicationLoader* GetLoaderForURL(const GURL& url,
                                      IncludeDefaultLoader fallback);
 
-  // Removes a ShellImpl when it encounters an error.
-  void OnShellImplError(ShellImpl* shell_impl);
-  //
   // Removes a ContentHandler when it encounters an error.
   void OnContentHandlerError(ContentHandlerConnection* content_handler);