diff options
| author | ben <ben@chromium.org> | 2016-03-11 16:57:56 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-12 01:00:33 +0000 |
| commit | 187701ef418c2d12febdd591e1587e9aec4a5ccf (patch) | |
| tree | 5263607910150c5462589fb985fd808a72e95f83 /mojo/shell/background | |
| parent | 58925fbb6bf9ab2360a2672424a8ef20b3c0cc67 (diff) | |
| download | chromium_src-187701ef418c2d12febdd591e1587e9aec4a5ccf.zip chromium_src-187701ef418c2d12febdd591e1587e9aec4a5ccf.tar.gz chromium_src-187701ef418c2d12febdd591e1587e9aec4a5ccf.tar.bz2 | |
Separate the Catalog from the Shell completely, so the Catalog can live in its own process.
BUG=
Review URL: https://codereview.chromium.org/1786683004
Cr-Commit-Position: refs/heads/master@{#380811}
Diffstat (limited to 'mojo/shell/background')
| -rw-r--r-- | mojo/shell/background/DEPS | 3 | ||||
| -rw-r--r-- | mojo/shell/background/background_shell.cc | 2 | ||||
| -rw-r--r-- | mojo/shell/background/background_shell.h | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/mojo/shell/background/DEPS b/mojo/shell/background/DEPS new file mode 100644 index 0000000..175fafb --- /dev/null +++ b/mojo/shell/background/DEPS @@ -0,0 +1,3 @@ +include_rules = [ + "+mojo/services/catalog", +] diff --git a/mojo/shell/background/background_shell.cc b/mojo/shell/background/background_shell.cc index e336e2c..ed1d5c5 100644 --- a/mojo/shell/background/background_shell.cc +++ b/mojo/shell/background/background_shell.cc @@ -12,7 +12,7 @@ #include "base/synchronization/waitable_event.h" #include "base/threading/simple_thread.h" #include "mojo/message_pump/message_pump_mojo.h" -#include "mojo/services/catalog/catalog.h" +#include "mojo/services/catalog/store.h" #include "mojo/shell/connect_params.h" #include "mojo/shell/loader.h" #include "mojo/shell/public/cpp/shell_client.h" diff --git a/mojo/shell/background/background_shell.h b/mojo/shell/background/background_shell.h index 3aa16b9..7af3714 100644 --- a/mojo/shell/background/background_shell.h +++ b/mojo/shell/background/background_shell.h @@ -10,7 +10,7 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "mojo/public/cpp/bindings/interface_request.h" -#include "mojo/services/catalog/catalog.h" +#include "mojo/services/catalog/store.h" #include "mojo/shell/public/interfaces/shell_client.mojom.h" namespace catalog { |