This gets mojo_launcher.so a little further along toward running.

It still doesn't run though.

R=ben@chromium.org

Review URL: https://codereview.chromium.org/265053005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@268261 0039d316-1c4b-4281-b951-d872f2087c98

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
-

mojo/examples/launcher/launcher.cc

@@ -67,6 +67,7 @@ class MinimalInputEventFilter : public ui::internal::InputMethodDelegate,
       : root_(root),
         input_method_(ui::CreateInputMethod(this,
                                             gfx::kNullAcceleratedWidget)) {
+    ui::InitializeInputMethod();
     input_method_->Init(true);
     root_->AddPreTargetHandler(this);
     root_->SetProperty(aura::client::kRootWindowInputMethodKey,

mojo/mojo_examples.gypi

@@ -249,6 +249,7 @@
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:base_i18n',
+            '../base/base.gyp:test_support_base',
             '../ui/aura/aura.gyp:aura',
             '../ui/aura/aura.gyp:aura_test_support',
             '../ui/base/ui_base.gyp:ui_base',

mojo/services/native_viewport/native_viewport_x11.cc

@@ -53,8 +53,9 @@ class NativeViewportX11 : public NativeViewport,
     atom_wm_delete_window_ = XInternAtom(display, "WM_DELETE_WINDOW", 1);
     XSetWMProtocols(display, window_, &atom_wm_delete_window_, 1);
 
-    // Assumes there is only one instance per process.
-    event_source_ = ui::PlatformEventSource::CreateDefault();
+    event_source_.reset(ui::PlatformEventSource::GetInstance());
+    if (!event_source_.get())
+      event_source_ = ui::PlatformEventSource::CreateDefault();
     ui::PlatformEventSource::GetInstance()->AddPlatformEventDispatcher(this);
 
     delegate_->OnAcceleratedWidgetAvailable(window_);