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

Unified Diff: mojo/examples/sample_app/sample_app.cc

Issue 128813002: Remove dependencies on base from SampleApp (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove unnecessary change 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/examples/sample_app/gles2_client_impl.cc ('k') | mojo/mojo_examples.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/examples/sample_app/sample_app.cc
diff --git a/mojo/examples/sample_app/sample_app.cc b/mojo/examples/sample_app/sample_app.cc
index b3bd71f0ede7f4c56b7f4037dd8364ce2669ed66..382aac9be34899c5c6440663004e5c322bf0ff48 100644
--- a/mojo/examples/sample_app/sample_app.cc
+++ b/mojo/examples/sample_app/sample_app.cc
@@ -5,14 +5,14 @@
#include <stdio.h>
#include <string>
-#include "base/message_loop/message_loop.h"
-#include "mojo/common/bindings_support_impl.h"
#include "mojo/examples/sample_app/gles2_client_impl.h"
#include "mojo/public/bindings/lib/bindings_support.h"
#include "mojo/public/bindings/lib/remote_ptr.h"
#include "mojo/public/gles2/gles2.h"
#include "mojo/public/system/core.h"
#include "mojo/public/system/macros.h"
+#include "mojo/public/utility/environment.h"
+#include "mojo/public/utility/run_loop.h"
#include "mojom/native_viewport.h"
#include "mojom/shell.h"
@@ -42,7 +42,6 @@ class SampleApp : public ShellClient {
}
virtual void AcceptConnection(ScopedMessagePipeHandle handle) MOJO_OVERRIDE {
- NOTREACHED() << "SampleApp can't be connected to.";
}
private:
@@ -63,7 +62,7 @@ class SampleApp : public ShellClient {
}
virtual void OnDestroyed() MOJO_OVERRIDE {
- base::MessageLoop::current()->Quit();
+ utility::RunLoop::current()->Quit();
}
virtual void OnEvent(const Event& event) MOJO_OVERRIDE {
@@ -86,9 +85,8 @@ class SampleApp : public ShellClient {
extern "C" SAMPLE_APP_EXPORT MojoResult CDECL MojoMain(
MojoHandle shell_handle) {
- base::MessageLoop loop;
- mojo::common::BindingsSupportImpl bindings_support_impl;
- mojo::BindingsSupport::Set(&bindings_support_impl);
+ mojo::utility::Environment env;
+ mojo::utility::RunLoop loop;
MojoGLES2Initialize();
mojo::examples::SampleApp app(
« no previous file with comments | « mojo/examples/sample_app/gles2_client_impl.cc ('k') | mojo/mojo_examples.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698