summaryrefslogtreecommitdiffstats
path: root/mojo/mojo.gyp
diff options
context:
space:
mode:
authorabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-19 00:17:09 +0000
committerabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-19 00:17:09 +0000
commiteba6f517a0602dc1507eb262808981f239e7b698 (patch)
tree133568eb685e6846ce0ddcbc1caa674d0542257c /mojo/mojo.gyp
parent3d08dd38aa2310d55dd7d9cc46089efa26abcb25 (diff)
downloadchromium_src-eba6f517a0602dc1507eb262808981f239e7b698.zip
chromium_src-eba6f517a0602dc1507eb262808981f239e7b698.tar.gz
chromium_src-eba6f517a0602dc1507eb262808981f239e7b698.tar.bz2
Teach mojo_shell how to load http URLs
After this CL, we can load content over HTTP. In order to make that work, I needed to introduce a number of basic concepts into the shell, including an IO thread and a directory to store data (such as the HTTP cache). I've tried to keep the net dependencies separated from the bulk of the mojo_shell code because I expect we'll want to move the net dependencies to an app that runs on top of the Mojo platform rather than linked into the mojo_shell itself. To that end, the mojo::loader::Loader class doesn't leak any net headers to its clients. The version of the loader in this CL is extremely basic. We'll undoubtedly make it fancier as time goes on. The next step after this CL is to store the result in a file and then load that file as a shared object. R=aa@chromium.org Review URL: https://codereview.chromium.org/27943002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229496 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/mojo.gyp')
-rw-r--r--mojo/mojo.gyp11
1 files changed, 11 insertions, 0 deletions
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index c69fc1a..b81d538 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -135,14 +135,25 @@
'type': 'executable',
'dependencies': [
'../base/base.gyp:base',
+ '../net/net.gyp:net',
'mojo_system',
],
'sources': [
+ 'loader/job.cc',
+ 'loader/job.h',
+ 'loader/loader.cc',
+ 'loader/loader.h',
+ 'loader/url_request_context_getter.cc',
+ 'loader/url_request_context_getter.h',
'shell/app_container.cc',
'shell/app_container.h',
'shell/shell.cc',
+ 'shell/storage.cc',
+ 'shell/storage.h',
'shell/switches.cc',
'shell/switches.h',
+ 'shell/task_runners.cc',
+ 'shell/task_runners.h',
],
'conditions': [
['OS == "win"', {