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

Side by Side Diff: mojo/examples/launcher/launcher.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
« no previous file with comments | « mojo/examples/aura_demo/aura_demo.cc ('k') | ui/aura/bench/bench_main.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 base::FilePath pak_file; 288 base::FilePath pak_file;
289 pak_file = pak_dir.Append(FILE_PATH_LITERAL("ui_test.pak")); 289 pak_file = pak_dir.Append(FILE_PATH_LITERAL("ui_test.pak"));
290 ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file); 290 ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
291 291
292 base::MessageLoop loop; 292 base::MessageLoop loop;
293 mojo::GLES2Initializer gles2; 293 mojo::GLES2Initializer gles2;
294 294
295 // TODO(beng): This crashes in a DCHECK on X11 because this thread's 295 // TODO(beng): This crashes in a DCHECK on X11 because this thread's
296 // MessageLoop is not of TYPE_UI. I think we need a way to build 296 // MessageLoop is not of TYPE_UI. I think we need a way to build
297 // Aura that doesn't define platform-specific stuff. 297 // Aura that doesn't define platform-specific stuff.
298 aura::Env::CreateInstance(); 298 aura::Env::CreateInstance(true);
299 mojo::examples::LauncherImpl launcher(shell_handle); 299 mojo::examples::LauncherImpl launcher(shell_handle);
300 loop.Run(); 300 loop.Run();
301 301
302 return MOJO_RESULT_OK; 302 return MOJO_RESULT_OK;
303 } 303 }
OLDNEW
« no previous file with comments | « mojo/examples/aura_demo/aura_demo.cc ('k') | ui/aura/bench/bench_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698