Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(195)

Side by Side Diff: shell/desktop/mojo_main.cc

Issue 1011333003: Fix races when the same bits are downloaded from 2 URLs. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Follow review Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « shell/application_manager/network_fetcher.cc ('k') | shell/switches.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <algorithm> 5 #include <algorithm>
6 #include <iostream> 6 #include <iostream>
7 7
8 #include "base/at_exit.h" 8 #include "base/at_exit.h"
9 #include "base/base_switches.h" 9 #include "base/base_switches.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 11 matching lines...) Expand all
22 std::cerr << "Launch Mojo applications.\n"; 22 std::cerr << "Launch Mojo applications.\n";
23 std::cerr 23 std::cerr
24 << "Usage: mojo_shell" 24 << "Usage: mojo_shell"
25 << " [--" << switches::kArgsFor << "=<mojo-app>]" 25 << " [--" << switches::kArgsFor << "=<mojo-app>]"
26 << " [--" << switches::kContentHandlers << "=<handlers>]" 26 << " [--" << switches::kContentHandlers << "=<handlers>]"
27 << " [--" << switches::kEnableExternalApplications << "]" 27 << " [--" << switches::kEnableExternalApplications << "]"
28 << " [--" << switches::kDisableCache << "]" 28 << " [--" << switches::kDisableCache << "]"
29 << " [--" << switches::kEnableMultiprocess << "]" 29 << " [--" << switches::kEnableMultiprocess << "]"
30 << " [--" << switches::kOrigin << "=<url-lib-path>]" 30 << " [--" << switches::kOrigin << "=<url-lib-path>]"
31 << " [--" << switches::kURLMappings << "=from1=to1,from2=to2]" 31 << " [--" << switches::kURLMappings << "=from1=to1,from2=to2]"
32 << " [--" << switches::kPredictableAppFilenames << "]"
32 << " [--" << switches::kWaitForDebugger << "]" 33 << " [--" << switches::kWaitForDebugger << "]"
33 << " <mojo-app> ...\n\n" 34 << " <mojo-app> ...\n\n"
34 << "A <mojo-app> is a Mojo URL or a Mojo URL and arguments within " 35 << "A <mojo-app> is a Mojo URL or a Mojo URL and arguments within "
35 << "quotes.\n" 36 << "quotes.\n"
36 << "Example: mojo_shell \"mojo:js_standalone test.js\".\n" 37 << "Example: mojo_shell \"mojo:js_standalone test.js\".\n"
37 << "<url-lib-path> is searched for shared libraries named by mojo URLs.\n" 38 << "<url-lib-path> is searched for shared libraries named by mojo URLs.\n"
38 << "The value of <handlers> is a comma separated list like:\n" 39 << "The value of <handlers> is a comma separated list like:\n"
39 << "text/html,mojo:html_viewer," 40 << "text/html,mojo:html_viewer,"
40 << "application/javascript,mojo:js_content_handler\n"; 41 << "application/javascript,mojo:js_content_handler\n";
41 } 42 }
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 FROM_HERE, 98 FROM_HERE,
98 base::Bind(&mojo::shell::RunCommandLineApps, &shell_context)); 99 base::Bind(&mojo::shell::RunCommandLineApps, &shell_context));
99 message_loop.Run(); 100 message_loop.Run();
100 101
101 // Must be called before |message_loop| is destroyed. 102 // Must be called before |message_loop| is destroyed.
102 shell_context.Shutdown(); 103 shell_context.Shutdown();
103 } 104 }
104 } 105 }
105 return 0; 106 return 0;
106 } 107 }
OLDNEW
« no previous file with comments | « shell/application_manager/network_fetcher.cc ('k') | shell/switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698