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

Side by Side Diff: mojo/examples/aura_demo/aura_demo.cc

Issue 262883011: Makes PlatformEventSource creation in Env conditional (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stdio.h> 5 #include <stdio.h>
6 #include <string> 6 #include <string>
7 7
8 #include "base/at_exit.h" 8 #include "base/at_exit.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 extern "C" AURA_DEMO_EXPORT MojoResult CDECL MojoMain( 180 extern "C" AURA_DEMO_EXPORT MojoResult CDECL MojoMain(
181 MojoHandle shell_handle) { 181 MojoHandle shell_handle) {
182 CommandLine::Init(0, NULL); 182 CommandLine::Init(0, NULL);
183 base::AtExitManager at_exit; 183 base::AtExitManager at_exit;
184 base::MessageLoop loop; 184 base::MessageLoop loop;
185 mojo::GLES2Initializer gles2; 185 mojo::GLES2Initializer gles2;
186 186
187 // TODO(beng): This crashes in a DCHECK on X11 because this thread's 187 // TODO(beng): This crashes in a DCHECK on X11 because this thread's
188 // MessageLoop is not of TYPE_UI. I think we need a way to build 188 // MessageLoop is not of TYPE_UI. I think we need a way to build
189 // Aura that doesn't define platform-specific stuff. 189 // Aura that doesn't define platform-specific stuff.
190 aura::Env::CreateInstance(); 190 aura::Env::CreateInstance(true);
191 mojo::examples::AuraDemo app(shell_handle); 191 mojo::examples::AuraDemo app(shell_handle);
192 loop.Run(); 192 loop.Run();
193 193
194 return MOJO_RESULT_OK; 194 return MOJO_RESULT_OK;
195 } 195 }
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_view_aura.cc ('k') | mojo/examples/launcher/launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698