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

Side by Side Diff: mojo/shell/standalone/context.h

Issue 1822213002: Changes to get mash browser_tests shutdown working correctly (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: order Created 4 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 | « content/public/test/test_launcher.cc ('k') | mojo/shell/standalone/context.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 #ifndef MOJO_SHELL_STANDALONE_CONTEXT_H_ 5 #ifndef MOJO_SHELL_STANDALONE_CONTEXT_H_
6 #define MOJO_SHELL_STANDALONE_CONTEXT_H_ 6 #define MOJO_SHELL_STANDALONE_CONTEXT_H_
7 7
8 #include "base/callback_forward.h" 8 #include "base/callback_forward.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 scoped_refptr<base::SingleThreadTaskRunner> shell_runner_; 68 scoped_refptr<base::SingleThreadTaskRunner> shell_runner_;
69 scoped_ptr<base::Thread> io_thread_; 69 scoped_ptr<base::Thread> io_thread_;
70 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; 70 scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
71 71
72 // Ensure this is destructed before task_runners_ since it owns a message pipe 72 // Ensure this is destructed before task_runners_ since it owns a message pipe
73 // that needs the IO thread to destruct cleanly. 73 // that needs the IO thread to destruct cleanly.
74 Tracer tracer_; 74 Tracer tracer_;
75 scoped_ptr<catalog::Factory> catalog_; 75 scoped_ptr<catalog::Factory> catalog_;
76 scoped_ptr<Shell> shell_; 76 scoped_ptr<Shell> shell_;
77 base::Time main_entry_time_; 77 base::Time main_entry_time_;
78 bool init_edk_ = false;
78 79
79 DISALLOW_COPY_AND_ASSIGN(Context); 80 DISALLOW_COPY_AND_ASSIGN(Context);
80 }; 81 };
81 82
82 } // namespace shell 83 } // namespace shell
83 } // namespace mojo 84 } // namespace mojo
84 85
85 #endif // MOJO_SHELL_STANDALONE_CONTEXT_H_ 86 #endif // MOJO_SHELL_STANDALONE_CONTEXT_H_
OLDNEW
« no previous file with comments | « content/public/test/test_launcher.cc ('k') | mojo/shell/standalone/context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698