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

Side by Side Diff: mojo/environment/environment.cc

Issue 1101303002: Update mojo sdk to rev e7270700d671fa8e458b4d8c9e47f7bcfb65da0b (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Actualy provide a default TaskTracker impl 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
« no previous file with comments | « mojo/environment/default_task_tracker_impl.cc ('k') | mojo/mojo_base.gyp » ('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 "third_party/mojo/src/mojo/public/cpp/environment/environment.h" 5 #include "third_party/mojo/src/mojo/public/cpp/environment/environment.h"
6 6
7 #include "mojo/environment/default_async_waiter_impl.h" 7 #include "mojo/environment/default_async_waiter_impl.h"
8 #include "mojo/environment/default_logger_impl.h" 8 #include "mojo/environment/default_logger_impl.h"
9 #include "mojo/environment/default_run_loop_impl.h" 9 #include "mojo/environment/default_run_loop_impl.h"
10 #include "mojo/environment/default_task_tracker_impl.h"
10 11
11 namespace mojo { 12 namespace mojo {
12 13
13 // These methods are intentionally not implemented so that there is a link 14 // These methods are intentionally not implemented so that there is a link
14 // error if someone uses them in a Chromium-environment. 15 // error if someone uses them in a Chromium-environment.
15 #if 0 16 #if 0
16 Environment::Environment() { 17 Environment::Environment() {
17 } 18 }
18 19
19 Environment::Environment(const MojoAsyncWaiter* default_async_waiter, 20 Environment::Environment(const MojoAsyncWaiter* default_async_waiter,
20 const MojoLogger* default_logger) { 21 const MojoLogger* default_logger) {
21 } 22 }
22 23
23 Environment::~Environment() { 24 Environment::~Environment() {
24 } 25 }
25 #endif 26 #endif
26 27
27 // static 28 // static
28 const MojoAsyncWaiter* Environment::GetDefaultAsyncWaiter() { 29 const MojoAsyncWaiter* Environment::GetDefaultAsyncWaiter() {
29 return internal::GetDefaultAsyncWaiterImpl(); 30 return internal::GetDefaultAsyncWaiterImpl();
30 } 31 }
31 32
32 // static 33 // static
33 const MojoLogger* Environment::GetDefaultLogger() { 34 const MojoLogger* Environment::GetDefaultLogger() {
34 return internal::GetDefaultLoggerImpl(); 35 return internal::GetDefaultLoggerImpl();
35 } 36 }
36 37
37 // static 38 // static
39 const TaskTracker* Environment::GetDefaultTaskTracker() {
40 return internal::GetDefaultTaskTracker();
41 }
42
43 // static
38 void Environment::InstantiateDefaultRunLoop() { 44 void Environment::InstantiateDefaultRunLoop() {
39 internal::InstantiateDefaultRunLoopImpl(); 45 internal::InstantiateDefaultRunLoopImpl();
40 } 46 }
41 47
42 // static 48 // static
43 void Environment::DestroyDefaultRunLoop() { 49 void Environment::DestroyDefaultRunLoop() {
44 internal::DestroyDefaultRunLoopImpl(); 50 internal::DestroyDefaultRunLoopImpl();
45 } 51 }
46 52
53
54
47 } // namespace mojo 55 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/environment/default_task_tracker_impl.cc ('k') | mojo/mojo_base.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698