diff options
| author | jamescook <jamescook@chromium.org> | 2014-11-11 15:48:06 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-11 23:49:23 +0000 |
| commit | 38424588fa4fa84b31c85034f4e427f67398a912 (patch) | |
| tree | 4367607ab50df21202f9e1944a29a889d2546f68 /extensions/shell/common | |
| parent | d47c1e4b6bb7e9b485f6dfede0236ddd5c823878 (diff) | |
| download | chromium_src-38424588fa4fa84b31c85034f4e427f67398a912.zip chromium_src-38424588fa4fa84b31c85034f4e427f67398a912.tar.gz chromium_src-38424588fa4fa84b31c85034f4e427f67398a912.tar.bz2 | |
app_shell: Connect shell.gcd app API to Chrome OS privetd DBus API
privetd is a Chrome OS local disovery and setup daemon. This connects the
shell.gcd app_shell API to the DBus methods to get setup status.
BUG=428853,428848
TEST=app_shell_unittests
Review URL: https://codereview.chromium.org/687823007
Cr-Commit-Position: refs/heads/master@{#303750}
Diffstat (limited to 'extensions/shell/common')
| -rw-r--r-- | extensions/shell/common/api/schemas.gni | 3 | ||||
| -rw-r--r-- | extensions/shell/common/api/schemas.gypi | 20 |
2 files changed, 19 insertions, 4 deletions
diff --git a/extensions/shell/common/api/schemas.gni b/extensions/shell/common/api/schemas.gni index 27dd0b8..b3b6db4 100644 --- a/extensions/shell/common/api/schemas.gni +++ b/extensions/shell/common/api/schemas.gni @@ -9,6 +9,9 @@ gypi_values = exec_script( [ "schemas.gypi" ]) sources = gypi_values.schema_files +if (is_chromeos) { + sources += gypi_values.chromeos_schema_files +} uncompiled_sources = gypi_values.non_compiled_schema_files diff --git a/extensions/shell/common/api/schemas.gypi b/extensions/shell/common/api/schemas.gypi index d2b0da8..f995048 100644 --- a/extensions/shell/common/api/schemas.gypi +++ b/extensions/shell/common/api/schemas.gypi @@ -7,16 +7,28 @@ '<@(schema_files)', ], 'variables': { - 'chromium_code': 1, - 'non_compiled_schema_files': [ - ], 'schema_files': [ 'identity.idl', - 'shell_gcd.idl', 'shell_window.idl', ], + 'non_compiled_schema_files': [ + ], + # Chrome OS specific APIs. + 'chromeos_schema_files': [ + 'shell_gcd.idl', + ], + + 'chromium_code': 1, 'cc_dir': 'extensions/shell/common/api', 'root_namespace': 'extensions::shell::api::%(namespace)s', 'impl_dir_': 'extensions/shell/browser/api', + + 'conditions': [ + ['chromeos==1', { + 'schema_files': [ + '<@(chromeos_schema_files)', + ], + }], + ], }, } |