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

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

Issue 292743017: Cleanup: Use base::CommandLine in mojo/ (Closed) Base URL: svn://chrome-svn/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/embedder/platform_channel_pair_win.cc ('k') | mojo/examples/launcher/launcher.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/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 aura::Window* window21_; 170 aura::Window* window21_;
171 171
172 scoped_ptr<aura::WindowTreeHost> window_tree_host_; 172 scoped_ptr<aura::WindowTreeHost> window_tree_host_;
173 }; 173 };
174 174
175 } // namespace examples 175 } // namespace examples
176 } // namespace mojo 176 } // namespace mojo
177 177
178 extern "C" AURA_DEMO_EXPORT MojoResult CDECL MojoMain( 178 extern "C" AURA_DEMO_EXPORT MojoResult CDECL MojoMain(
179 MojoHandle shell_handle) { 179 MojoHandle shell_handle) {
180 CommandLine::Init(0, NULL); 180 base::CommandLine::Init(0, NULL);
181 base::AtExitManager at_exit; 181 base::AtExitManager at_exit;
182 base::MessageLoop loop; 182 base::MessageLoop loop;
183 mojo::GLES2Initializer gles2; 183 mojo::GLES2Initializer gles2;
184 184
185 // TODO(beng): This crashes in a DCHECK on X11 because this thread's 185 // TODO(beng): This crashes in a DCHECK on X11 because this thread's
186 // MessageLoop is not of TYPE_UI. I think we need a way to build 186 // MessageLoop is not of TYPE_UI. I think we need a way to build
187 // Aura that doesn't define platform-specific stuff. 187 // Aura that doesn't define platform-specific stuff.
188 aura::Env::CreateInstance(true); 188 aura::Env::CreateInstance(true);
189 mojo::examples::AuraDemo app(shell_handle); 189 mojo::examples::AuraDemo app(shell_handle);
190 loop.Run(); 190 loop.Run();
191 191
192 return MOJO_RESULT_OK; 192 return MOJO_RESULT_OK;
193 } 193 }
OLDNEW
« no previous file with comments | « mojo/embedder/platform_channel_pair_win.cc ('k') | mojo/examples/launcher/launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698