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

Unified Diff: mojo/examples/aura_demo/demo_context_factory.cc

Issue 265053005: This gets mojo_launcher.so a little further along toward running. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: benments Created 6 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 | « no previous file | mojo/examples/launcher/launcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/examples/aura_demo/demo_context_factory.cc
diff --git a/mojo/examples/aura_demo/demo_context_factory.cc b/mojo/examples/aura_demo/demo_context_factory.cc
index 065221733a4b99c06b50389d419c4faebc49f9fd..19af8e50b77971bf3e70be6787e35ead23f7aef7 100644
--- a/mojo/examples/aura_demo/demo_context_factory.cc
+++ b/mojo/examples/aura_demo/demo_context_factory.cc
@@ -24,11 +24,16 @@ DemoContextFactory::~DemoContextFactory() {
}
bool DemoContextFactory::Initialize() {
+ if (gfx::GetGLImplementation() != gfx::kGLImplementationNone) {
+ return true;
+ }
+
if (!gfx::GLSurface::InitializeOneOff() ||
gfx::GetGLImplementation() == gfx::kGLImplementationNone) {
LOG(ERROR) << "Could not load the GL bindings";
return false;
}
+
return true;
}
@@ -70,4 +75,3 @@ bool DemoContextFactory::DoesCreateTestContexts() { return false; }
} // namespace examples
} // namespace mojo
-
« no previous file with comments | « no previous file | mojo/examples/launcher/launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698