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

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

Issue 939353002: Fix mojo::shell::Context shutdown. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 10 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/context.cc ('k') | shell/in_process_dynamic_service_runner_unittest.cc » ('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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 // because it can appear more than once. The base::CommandLine class 101 // because it can appear more than once. The base::CommandLine class
102 // collapses multiple occurrences of the same switch. 102 // collapses multiple occurrences of the same switch.
103 for (int i = 1; i < argc; i++) { 103 for (int i = 1; i < argc; i++) {
104 ApplyApplicationArgs(&shell_context, argv[i]); 104 ApplyApplicationArgs(&shell_context, argv[i]);
105 } 105 }
106 106
107 message_loop.PostTask( 107 message_loop.PostTask(
108 FROM_HERE, 108 FROM_HERE,
109 base::Bind(&mojo::shell::RunCommandLineApps, &shell_context)); 109 base::Bind(&mojo::shell::RunCommandLineApps, &shell_context));
110 message_loop.Run(); 110 message_loop.Run();
111
112 // Must be called be |message_loop| is destroyed.
qsr 2015/02/20 13:14:31 nit: Comment seems wrong.
viettrungluu 2015/02/20 15:59:33 Oops. I TBRed a fix for this. Thanks.
113 shell_context.Shutdown();
111 } 114 }
112 } 115 }
113 return 0; 116 return 0;
114 } 117 }
OLDNEW
« no previous file with comments | « shell/context.cc ('k') | shell/in_process_dynamic_service_runner_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698