diff options
| author | sky <sky@chromium.org> | 2016-02-23 15:18:24 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-23 23:21:09 +0000 |
| commit | d6439eceec0ac412e5ce440847609a4d807e0f90 (patch) | |
| tree | 2d98d90e8650bd485ec41fec9d4950e6f8ce61c5 /mojo/shell/background/background_shell.h | |
| parent | 11daa8bde0d19cf459ab49808e4aad6cecd768b6 (diff) | |
| download | chromium_src-d6439eceec0ac412e5ce440847609a4d807e0f90.zip chromium_src-d6439eceec0ac412e5ce440847609a4d807e0f90.tar.gz chromium_src-d6439eceec0ac412e5ce440847609a4d807e0f90.tar.bz2 | |
Adds ability for chrome to behave as mojo_runner
This adds the arg use_mash that is only true on chromeos. Once
compiled with use_mash if you supply --mash to chrome it'll start the
shell inside chrome.
I haven't wired chrome up to start in this environment. Will do that
next.
BUG=581539
TEST=none
R=ben@chromium.org
Review URL: https://codereview.chromium.org/1722743002
Cr-Commit-Position: refs/heads/master@{#377113}
Diffstat (limited to 'mojo/shell/background/background_shell.h')
| -rw-r--r-- | mojo/shell/background/background_shell.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mojo/shell/background/background_shell.h b/mojo/shell/background/background_shell.h index d1e9c41..e04d282 100644 --- a/mojo/shell/background/background_shell.h +++ b/mojo/shell/background/background_shell.h @@ -17,7 +17,7 @@ class GURL; namespace mojo { namespace shell { -struct CommandLineSwitch; +class NativeRunnerDelegate; // BackgroundShell starts up the mojo shell on a background thread, and // destroys the thread in the destructor. Once created use CreateApplication() @@ -28,9 +28,8 @@ class BackgroundShell { BackgroundShell(); ~BackgroundShell(); - // Starts the background shell. |command_line_switches| are additional - // switches applied to any processes spawned by this call. - void Init(const std::vector<CommandLineSwitch>& command_line_switches); + // Starts the background shell. + void Init(NativeRunnerDelegate* native_runner_delegate); // Obtains an InterfaceRequest for the specified url. InterfaceRequest<mojom::ShellClient> CreateShellClientRequest( |