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

Unified Diff: trunk/src/mojo/shell/app_container.h

Issue 62103015: Revert 234975 "Work in progress for end-to-end bindings" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 1 month 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 | « trunk/src/mojo/public/bindings/mojom_bindings_generator.gypi ('k') | trunk/src/mojo/shell/app_container.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/mojo/shell/app_container.h
===================================================================
--- trunk/src/mojo/shell/app_container.h (revision 235033)
+++ trunk/src/mojo/shell/app_container.h (working copy)
@@ -8,7 +8,6 @@
#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
-#include "mojo/examples/hello_world_service/hello_world_service_impl.h"
#include "mojo/public/system/core.h"
#include "mojo/shell/loader.h"
@@ -43,9 +42,11 @@
Context* context_;
scoped_ptr<Loader::Job> request_;
scoped_ptr<base::Thread> thread_;
- scoped_ptr<examples::HelloWorldServiceImpl> hello_world_service_;
scoped_ptr<services::NativeViewportController> native_viewport_controller_;
+ // Following members are valid only on app thread.
+ Handle shell_handle_;
+
base::WeakPtrFactory<AppContainer> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(AppContainer);
« no previous file with comments | « trunk/src/mojo/public/bindings/mojom_bindings_generator.gypi ('k') | trunk/src/mojo/shell/app_container.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698