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

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

Issue 477923004: Create native_viewport_service, don't build it into mojo_shell unless Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Get the static build to work Created 6 years, 4 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 <string> 8 #include <string>
9 9
10 #include "mojo/application_manager/application_manager.h" 10 #include "mojo/application_manager/application_manager.h"
(...skipping 25 matching lines...) Expand all
36 ApplicationManager* application_manager() { return &application_manager_; } 36 ApplicationManager* application_manager() { return &application_manager_; }
37 KeepAliveCounter* keep_alive_counter() { return &keep_alive_counter_; } 37 KeepAliveCounter* keep_alive_counter() { return &keep_alive_counter_; }
38 MojoURLResolver* mojo_url_resolver() { return &mojo_url_resolver_; } 38 MojoURLResolver* mojo_url_resolver() { return &mojo_url_resolver_; }
39 39
40 #if defined(OS_ANDROID) 40 #if defined(OS_ANDROID)
41 base::MessageLoop* ui_loop() const { return ui_loop_; } 41 base::MessageLoop* ui_loop() const { return ui_loop_; }
42 void set_ui_loop(base::MessageLoop* ui_loop) { ui_loop_ = ui_loop; } 42 void set_ui_loop(base::MessageLoop* ui_loop) { ui_loop_ = ui_loop; }
43 #endif // defined(OS_ANDROID) 43 #endif // defined(OS_ANDROID)
44 44
45 private: 45 private:
46 class NativeViewportApplicationLoader;
47
48 scoped_ptr<TaskRunners> task_runners_; 46 scoped_ptr<TaskRunners> task_runners_;
49 ApplicationManager application_manager_; 47 ApplicationManager application_manager_;
50 MojoURLResolver mojo_url_resolver_; 48 MojoURLResolver mojo_url_resolver_;
51 scoped_ptr<Spy> spy_; 49 scoped_ptr<Spy> spy_;
52 #if defined(OS_ANDROID) 50 #if defined(OS_ANDROID)
53 base::MessageLoop* ui_loop_; 51 base::MessageLoop* ui_loop_;
54 #endif // defined(OS_ANDROID) 52 #endif // defined(OS_ANDROID)
55 53
56 KeepAliveCounter keep_alive_counter_; 54 KeepAliveCounter keep_alive_counter_;
57 55
58 DISALLOW_COPY_AND_ASSIGN(Context); 56 DISALLOW_COPY_AND_ASSIGN(Context);
59 }; 57 };
60 58
61 } // namespace shell 59 } // namespace shell
62 } // namespace mojo 60 } // namespace mojo
63 61
64 #endif // MOJO_SHELL_CONTEXT_H_ 62 #endif // MOJO_SHELL_CONTEXT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698