summaryrefslogtreecommitdiffstats
path: root/mojo/mojo_shell.gyp
diff options
context:
space:
mode:
authorben <ben@chromium.org>2016-03-22 12:23:05 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-22 19:24:32 +0000
commit96bdd00a3c4db5cdf69e3e3e5a875c31ac413224 (patch)
treea067df7347504485abe170f911d18bdb5f467f1c /mojo/mojo_shell.gyp
parent7131ebe0af4b20c6b0d8c138733cf944094e5adb (diff)
downloadchromium_src-96bdd00a3c4db5cdf69e3e3e5a875c31ac413224.zip
chromium_src-96bdd00a3c4db5cdf69e3e3e5a875c31ac413224.tar.gz
chromium_src-96bdd00a3c4db5cdf69e3e3e5a875c31ac413224.tar.bz2
Move serialize/deserialize logic onto Entry.
I'm trying to shift manifest reading/deserialization out of the catalog. The idea is we'll end up with two instances of the catalog per user, linked, one with the user-specific entries, and one with the entries that came with the distribution. I also flipped some of the CHECK()s in dictionary analysis to return errors. Eventually this should throw a more meaningful error via Shell::Connect(). R=sky@chromium.org BUG= Review URL: https://codereview.chromium.org/1818373003 Cr-Commit-Position: refs/heads/master@{#382633}
Diffstat (limited to 'mojo/mojo_shell.gyp')
-rw-r--r--mojo/mojo_shell.gyp2
1 files changed, 0 insertions, 2 deletions
diff --git a/mojo/mojo_shell.gyp b/mojo/mojo_shell.gyp
index 9f4c80b..26144ab 100644
--- a/mojo/mojo_shell.gyp
+++ b/mojo/mojo_shell.gyp
@@ -7,8 +7,6 @@
'target_name': 'mojo_shell_lib',
'type': 'static_library',
'sources': [
- 'services/catalog/builder.cc',
- 'services/catalog/builder.h',
'services/catalog/catalog.cc',
'services/catalog/catalog.h',
'services/catalog/entry.cc',