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

Side by Side Diff: mojo/shell/switches.cc

Issue 1065433002: Simplify some mojo_shell code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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
« mojo/services/kiosk_wm/kiosk_wm.cc ('K') | « mojo/shell/switches.h ('k') | no next file » | 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 "mojo/shell/switches.h" 5 #include "mojo/shell/switches.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 8
9 namespace switches { 9 namespace switches {
10 10
(...skipping 17 matching lines...) Expand all
28 // text/html,mojo:html_viewer,application/bravo,https://abarth.com/bravo 28 // text/html,mojo:html_viewer,application/bravo,https://abarth.com/bravo
29 const char kContentHandlers[] = "content-handlers"; 29 const char kContentHandlers[] = "content-handlers";
30 30
31 // Force dynamically loaded apps / services to be loaded irrespective of cache 31 // Force dynamically loaded apps / services to be loaded irrespective of cache
32 // instructions. 32 // instructions.
33 const char kDisableCache[] = "disable-cache"; 33 const char kDisableCache[] = "disable-cache";
34 34
35 // If set apps downloaded are not deleted. 35 // If set apps downloaded are not deleted.
36 const char kDontDeleteOnDownload[] = "dont-delete-on-download"; 36 const char kDontDeleteOnDownload[] = "dont-delete-on-download";
37 37
38 // Allow externally-running applications to discover, connect to, and register
39 // themselves with the shell.
40 // TODO(cmasone): Work in progress. Once we're sure this works, remove.
41 const char kEnableExternalApplications[] = "enable-external-applications";
42
43 // Load apps in separate processes. 38 // Load apps in separate processes.
44 // TODO(vtl): Work in progress; doesn't work. Flip this to "disable" (or maybe 39 // TODO(vtl): Work in progress; doesn't work. Flip this to "disable" (or maybe
45 // change it to "single-process") when it works. 40 // change it to "single-process") when it works.
46 const char kEnableMultiprocess[] = "enable-multiprocess"; 41 const char kEnableMultiprocess[] = "enable-multiprocess";
47 42
48 // In multiprocess mode, force these apps to be loaded in the main process. 43 // In multiprocess mode, force these apps to be loaded in the main process.
49 // Comma-separate list of URLs. Example: 44 // Comma-separate list of URLs. Example:
50 // --force-in-process=mojo:native_viewport_service,mojo:network_service 45 // --force-in-process=mojo:native_viewport_service,mojo:network_service
51 const char kForceInProcess[] = "force-in-process"; 46 const char kForceInProcess[] = "force-in-process";
52 47
(...skipping 25 matching lines...) Expand all
78 // the first maps 'a' to 'b' and the second 'c' to 'd'. 73 // the first maps 'a' to 'b' and the second 'c' to 'd'.
79 const char kURLMappings[] = "url-mappings"; 74 const char kURLMappings[] = "url-mappings";
80 75
81 // Switches valid for the main process (i.e., that the user may pass in). 76 // Switches valid for the main process (i.e., that the user may pass in).
82 const char* kSwitchArray[] = {kV, 77 const char* kSwitchArray[] = {kV,
83 kArgsFor, 78 kArgsFor,
84 // |kChildProcess| not for user use. 79 // |kChildProcess| not for user use.
85 kContentHandlers, 80 kContentHandlers,
86 kDisableCache, 81 kDisableCache,
87 kDontDeleteOnDownload, 82 kDontDeleteOnDownload,
88 kEnableExternalApplications,
89 kEnableMultiprocess, 83 kEnableMultiprocess,
90 kForceInProcess, 84 kForceInProcess,
91 kHelp, 85 kHelp,
92 kMapOrigin, 86 kMapOrigin,
93 kOrigin, 87 kOrigin,
94 kPredictableAppFilenames, 88 kPredictableAppFilenames,
95 kTraceStartup, 89 kTraceStartup,
96 kURLMappings}; 90 kURLMappings};
97 91
98 const std::set<std::string> GetAllSwitches() { 92 const std::set<std::string> GetAllSwitches() {
99 std::set<std::string> switch_set; 93 std::set<std::string> switch_set;
100 94
101 for (size_t i = 0; i < arraysize(kSwitchArray); ++i) 95 for (size_t i = 0; i < arraysize(kSwitchArray); ++i)
102 switch_set.insert(kSwitchArray[i]); 96 switch_set.insert(kSwitchArray[i]);
103 return switch_set; 97 return switch_set;
104 } 98 }
105 99
106 } // namespace switches 100 } // namespace switches
OLDNEW
« mojo/services/kiosk_wm/kiosk_wm.cc ('K') | « mojo/shell/switches.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698