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

Unified Diff: sky/shell/shell.h

Issue 1139873004: Make android directory for Android-specific bits of SkyShell (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/shell/service_provider.h ('k') | sky/shell/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/shell/shell.h
diff --git a/sky/shell/shell.h b/sky/shell/shell.h
index 4ac112c1fff86c732e6d0f9407bb8d0fdca33228..558468d17eaa55a22a81fe0078cc9c45a2dc255b 100644
--- a/sky/shell/shell.h
+++ b/sky/shell/shell.h
@@ -10,34 +10,30 @@
#include "base/memory/scoped_ptr.h"
#include "base/threading/thread.h"
-namespace base {
-class SingleThreadTaskRunner;
-}
-
namespace sky {
namespace shell {
class Engine;
-class Rasterizer;
class PlatformView;
+class Rasterizer;
+class ServiceProviderContext;
class Shell {
public:
~Shell();
static void Init(
- scoped_refptr<base::SingleThreadTaskRunner> java_task_runner);
+ scoped_ptr<ServiceProviderContext> service_provider_context);
static Shell& Shared();
PlatformView* view() const { return view_.get(); }
private:
- explicit Shell(scoped_refptr<base::SingleThreadTaskRunner> java_task_runner);
+ explicit Shell(scoped_ptr<ServiceProviderContext> service_provider_context);
void InitGPU(const base::Thread::Options& options);
void InitUI(const base::Thread::Options& options);
void InitView();
- scoped_refptr<base::SingleThreadTaskRunner> java_task_runner_;
scoped_ptr<base::Thread> gpu_thread_;
scoped_ptr<base::Thread> ui_thread_;
@@ -45,6 +41,8 @@ class Shell {
scoped_ptr<Rasterizer> rasterizer_;
scoped_ptr<Engine> engine_;
+ scoped_ptr<ServiceProviderContext> service_provider_context_;
+
DISALLOW_COPY_AND_ASSIGN(Shell);
};
« no previous file with comments | « sky/shell/service_provider.h ('k') | sky/shell/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698