Refactor extension handling code from AppShimHost into ExtensionAppShimHandler.

apps/app_shim/app_shim_host_mac.h

 // Copyright 2013 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.
 
 #ifndef CHROME_BROWSER_WEB_APPLICATIONS_APP_SHIM_HOST_MAC_H_
 #define CHROME_BROWSER_WEB_APPLICATIONS_APP_SHIM_HOST_MAC_H_
 
 #include <string>
 
 #include "apps/app_shim/app_shim_handler_mac.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/non_thread_safe.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_sender.h"
 
 class Profile;
 
 namespace IPC {
 struct ChannelHandle;
 class ChannelProxy;
 class Message;
 }  // namespace IPC
 
 // This is the counterpart to AppShimController in
 // chrome/app/chrome_main_app_mode_mac.mm. The AppShimHost owns itself, and is
 // destroyed when the app it corresponds to is closed or when the channel
 // connected to the app shim is closed.
 class AppShimHost : public IPC::Listener,
                     public IPC::Sender,
                     public apps::AppShimHandler::Host,
-                    public content::NotificationObserver,
                     public base::NonThreadSafe {
  public:
   AppShimHost();
   virtual ~AppShimHost();
 
   // Creates a new server-side IPC channel at |handle|, which should contain a
   // file descriptor of a channel created by an IPC::ChannelFactory, and begins
   // listening for messages on it.
   void ServeChannel(const IPC::ChannelHandle& handle);
 
  protected:
-  const std::string& app_id() const { return app_id_; }
-  const Profile* profile() const { return profile_; }
+  virtual const std::string& app_id() const OVERRIDE;

[tapted, 2013/05/21 06:15:37]

nit: move these to the same place as the other overrides, or add a
`apps::AppShimHandler::Host overrides:` comment.

The jury is still out on whether overrides should be private, but Chrome
preference seems to be 'make them private if you can'. It might mean you need to
implicit_cast to the base class in tests, so keep them protected if that gets
too ugly.

[jackhou1, 2013/05/22 23:54:44]

Done.

+  virtual Profile* profile() const OVERRIDE;
 
   // Used internally; virtual so they can be mocked for testing.
   virtual Profile* FetchProfileForDirectory(const std::string& profile_dir);
-  virtual bool LaunchApp(Profile* profile);
 
   // IPC::Listener implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void OnChannelError() OVERRIDE;
 
   // IPC::Sender implementation.
   virtual bool Send(IPC::Message* message) OVERRIDE;
 
  private:
   // The app shim process is requesting that an app be launched. Once it has
   // done so the |profile| and |app_id| are stored, and all future messages
   // from the app shim relate to the app it launched. It is an error for the
   // app shim to send multiple launch messages.
   void OnLaunchApp(std::string profile, std::string app_id);
 
   // Called when the app shim process notifies that the app should be brought
   // to the front (i.e. the user has clicked on the app's icon in the dock or
   // Cmd+Tabbed to it.)
   void OnFocus();
 
-  bool LaunchAppImpl(const std::string& profile_dir);
-
-  // The AppShimHost listens to the NOTIFICATION_EXTENSION_HOST_DESTROYED
-  // message to detect when the app closes. When that happens, the AppShimHost
-  // closes the channel, which causes the app shim process to quit.
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
-
   // apps::AppShimHandler::Host override:
   virtual void OnAppClosed() OVERRIDE;
 
   // Closes the channel and destroys the AppShimHost.
   void Close();
 
   scoped_ptr<IPC::ChannelProxy> channel_;
   std::string app_id_;
   Profile* profile_;
-  content::NotificationRegistrar registrar_;
 };
 
 #endif  // CHROME_BROWSER_WEB_APPLICATIONS_APP_SHIM_HOST_MAC_H_