| Index: apps/app_shim/app_shim_host_mac.h
|
| diff --git a/apps/app_shim/app_shim_host_mac.h b/apps/app_shim/app_shim_host_mac.h
|
| index e68380c314abb8f66d97f6b5459d19df68e458a8..c62d405a05a703a91643f19e5c96dcc7eef5d8d5 100644
|
| --- a/apps/app_shim/app_shim_host_mac.h
|
| +++ b/apps/app_shim/app_shim_host_mac.h
|
| @@ -8,6 +8,7 @@
|
| #include <string>
|
|
|
| #include "apps/app_shim/app_shim_handler_mac.h"
|
| +#include "base/files/file_path.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/threading/non_thread_safe.h"
|
| #include "ipc/ipc_listener.h"
|
| @@ -41,7 +42,7 @@ class AppShimHost : public IPC::Listener,
|
| protected:
|
|
|
| // Used internally; virtual so they can be mocked for testing.
|
| - virtual Profile* FetchProfileForDirectory(const std::string& profile_dir);
|
| + virtual Profile* FetchProfileForDirectory(const base::FilePath& profile_dir);
|
|
|
| // IPC::Listener implementation.
|
| virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
|
| @@ -51,11 +52,13 @@ class AppShimHost : public IPC::Listener,
|
| 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);
|
| + // The app shim process is requesting to be associated with the given profile
|
| + // and app_id. Once the profile and app_id are stored, and all future
|
| + // messages from the app shim relate to this app. The app is launched
|
| + // immediately if |launch_now| is true.
|
| + void OnLaunchApp(base::FilePath profile_dir,
|
| + std::string app_id,
|
| + bool launch_now);
|
|
|
| // 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
|
|
|