diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-17 17:06:32 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-17 17:06:32 +0000 |
| commit | fc232b598c601e066f6a17b5c647b1e30667f38e (patch) | |
| tree | bc7bb8d459caaed60ddc882d9aa66caa4bedacd0 /remoting/tools/client_webserver | |
| parent | c1e0696a17d2683b191ebc9b3b5233260c12c3db (diff) | |
| download | chromium_src-fc232b598c601e066f6a17b5c647b1e30667f38e.zip chromium_src-fc232b598c601e066f6a17b5c647b1e30667f38e.tar.gz chromium_src-fc232b598c601e066f6a17b5c647b1e30667f38e.tar.bz2 | |
Hookup the ChromotingPlugin into the refactored implementation
of HostConnection and ChromotingView. Also implement a bare-bones
PepperView.
No unittests yet. Still too in flux to be worth it.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/2852003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50116 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/tools/client_webserver')
| -rw-r--r-- | remoting/tools/client_webserver/main.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/remoting/tools/client_webserver/main.c b/remoting/tools/client_webserver/main.c index 6f7baba..f9494b4 100644 --- a/remoting/tools/client_webserver/main.c +++ b/remoting/tools/client_webserver/main.c @@ -106,7 +106,10 @@ void handle_request(int connection) { // However, we return empty content, but with the requested plugin mimetype. write_data(connection, "HTTP/1.0 200 OK\r\n"); write_data(connection, "Content-Type: "); - write_data(connection, mime_type); + // TODO(ajwong): Currently hardcoding the mimetype rather than parsing out of + // URL to make it easier to invoke the plugin. Change this back to writing + // |mime_type| out after we get things cleaned up. + write_data(connection, "pepper-application/x-chromoting-plugin"); write_data(connection, "\r\n\r\n"); // This dummy data is unused, but must be present or else the reader may hang. |