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

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

Issue 134253004: Mojo: AsyncWaiter and mojo/public/environment (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add missing files Created 6 years, 11 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 | Annotate | Revision Log
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_CONTEXT_H_ 5 #ifndef MOJO_SHELL_CONTEXT_H_
6 #define MOJO_SHELL_CONTEXT_H_ 6 #define MOJO_SHELL_CONTEXT_H_
7 7
8 #include "mojo/common/bindings_support_impl.h"
9 #include "mojo/shell/loader.h" 8 #include "mojo/shell/loader.h"
10 #include "mojo/shell/service_manager.h" 9 #include "mojo/shell/service_manager.h"
11 #include "mojo/shell/storage.h" 10 #include "mojo/shell/storage.h"
12 #include "mojo/shell/task_runners.h" 11 #include "mojo/shell/task_runners.h"
13 12
14 #if defined(OS_ANDROID) 13 #if defined(OS_ANDROID)
15 #include "base/android/scoped_java_ref.h" 14 #include "base/android/scoped_java_ref.h"
16 #endif // defined(OS_ANDROID) 15 #endif // defined(OS_ANDROID)
17 16
18 namespace mojo { 17 namespace mojo {
(...skipping 14 matching lines...) Expand all
33 #if defined(OS_ANDROID) 32 #if defined(OS_ANDROID)
34 jobject activity() const { return activity_.obj(); } 33 jobject activity() const { return activity_.obj(); }
35 void set_activity(jobject activity) { activity_.Reset(NULL, activity); } 34 void set_activity(jobject activity) { activity_.Reset(NULL, activity); }
36 #endif // defined(OS_ANDROID) 35 #endif // defined(OS_ANDROID)
37 36
38 private: 37 private:
39 TaskRunners task_runners_; 38 TaskRunners task_runners_;
40 Storage storage_; 39 Storage storage_;
41 Loader loader_; 40 Loader loader_;
42 ServiceManager service_manager_; 41 ServiceManager service_manager_;
43 common::BindingsSupportImpl bindings_support_impl_;
44 scoped_ptr<DynamicServiceLoader> dynamic_service_loader_; 42 scoped_ptr<DynamicServiceLoader> dynamic_service_loader_;
45 43
46 #if defined(OS_ANDROID) 44 #if defined(OS_ANDROID)
47 base::android::ScopedJavaGlobalRef<jobject> activity_; 45 base::android::ScopedJavaGlobalRef<jobject> activity_;
48 #endif // defined(OS_ANDROID) 46 #endif // defined(OS_ANDROID)
49 47
50 DISALLOW_COPY_AND_ASSIGN(Context); 48 DISALLOW_COPY_AND_ASSIGN(Context);
51 }; 49 };
52 50
53 } // namespace shell 51 } // namespace shell
54 } // namespace mojo 52 } // namespace mojo
55 53
56 #endif // MOJO_SHELL_CONTEXT_H_ 54 #endif // MOJO_SHELL_CONTEXT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698