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

Side by Side Diff: shell/child_main.cc

Issue 1131953006: Shell: switches cleanup. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: gn android fix Created 5 years, 7 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/child_process_host.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 <unistd.h> 5 #include <unistd.h>
6 6
7 #include "base/at_exit.h" 7 #include "base/at_exit.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/callback_helpers.h" 9 #include "base/callback_helpers.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/files/file_path.h" 11 #include "base/files/file_path.h"
12 #include "base/location.h" 12 #include "base/location.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/memory/ref_counted.h" 15 #include "base/memory/ref_counted.h"
16 #include "base/memory/scoped_ptr.h" 16 #include "base/memory/scoped_ptr.h"
17 #include "base/message_loop/message_loop.h" 17 #include "base/message_loop/message_loop.h"
18 #include "base/single_thread_task_runner.h" 18 #include "base/single_thread_task_runner.h"
19 #include "base/synchronization/waitable_event.h" 19 #include "base/synchronization/waitable_event.h"
20 #include "base/threading/thread.h" 20 #include "base/threading/thread.h"
21 #include "base/threading/thread_checker.h" 21 #include "base/threading/thread_checker.h"
22 #include "mojo/common/message_pump_mojo.h" 22 #include "mojo/common/message_pump_mojo.h"
23 #include "mojo/edk/embedder/embedder.h" 23 #include "mojo/edk/embedder/embedder.h"
24 #include "mojo/edk/embedder/platform_channel_pair.h" 24 #include "mojo/edk/embedder/platform_channel_pair.h"
25 #include "mojo/edk/embedder/process_delegate.h" 25 #include "mojo/edk/embedder/process_delegate.h"
26 #include "mojo/edk/embedder/scoped_platform_handle.h" 26 #include "mojo/edk/embedder/scoped_platform_handle.h"
27 #include "mojo/edk/embedder/simple_platform_support.h" 27 #include "mojo/edk/embedder/simple_platform_support.h"
28 #include "mojo/public/cpp/system/core.h" 28 #include "mojo/public/cpp/system/core.h"
29 #include "shell/child_controller.mojom.h" 29 #include "shell/child_controller.mojom.h"
30 #include "shell/child_switches.h"
30 #include "shell/init.h" 31 #include "shell/init.h"
31 #include "shell/native_application_support.h" 32 #include "shell/native_application_support.h"
32 #include "shell/switches.h"
33 33
34 namespace shell { 34 namespace shell {
35 namespace { 35 namespace {
36 36
37 // Blocker --------------------------------------------------------------------- 37 // Blocker ---------------------------------------------------------------------
38 38
39 // Blocks a thread until another thread unblocks it, at which point it unblocks 39 // Blocks a thread until another thread unblocks it, at which point it unblocks
40 // and runs a closure provided by that thread. 40 // and runs a closure provided by that thread.
41 class Blocker { 41 class Blocker {
42 public: 42 public:
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 base::Bind(&shell::ChildControllerImpl::Init, 300 base::Bind(&shell::ChildControllerImpl::Init,
301 base::Unretained(&app_context), 301 base::Unretained(&app_context),
302 base::Passed(&platform_channel), blocker.GetUnblocker())); 302 base::Passed(&platform_channel), blocker.GetUnblocker()));
303 // This will block, then run whatever the controller wants. 303 // This will block, then run whatever the controller wants.
304 blocker.Block(); 304 blocker.Block();
305 305
306 app_context.Shutdown(); 306 app_context.Shutdown();
307 307
308 return 0; 308 return 0;
309 } 309 }
OLDNEW
« no previous file with comments | « shell/application_manager/network_fetcher.cc ('k') | shell/child_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698