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

Side by Side Diff: mojo/services/html_viewer/html_viewer.cc

Issue 823853003: Enable logging in mojo:media app. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 12 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
« no previous file with comments | « media/mojo/services/mojo_media_application.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/logging.h" 6 #include "base/logging.h"
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "base/threading/thread.h" 10 #include "base/threading/thread.h"
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 #elif defined(OS_POSIX) 163 #elif defined(OS_POSIX)
164 command_line_args = app->args(); 164 command_line_args = app->args();
165 #endif 165 #endif
166 166
167 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); 167 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
168 command_line->InitFromArgv(command_line_args); 168 command_line->InitFromArgv(command_line_args);
169 169
170 logging::LoggingSettings settings; 170 logging::LoggingSettings settings;
171 settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG; 171 settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
172 logging::InitLogging(settings); 172 logging::InitLogging(settings);
173 // Display process ID, thread ID and timestamp in logs.
174 logging::SetLogItems(true, true, true, false);
173 175
174 bool enable_mojo_media_renderer = 176 bool enable_mojo_media_renderer =
175 command_line->HasSwitch(kEnableMojoMediaRenderer); 177 command_line->HasSwitch(kEnableMojoMediaRenderer);
176 178
177 compositor_thread_.Start(); 179 compositor_thread_.Start();
178 web_media_player_factory_.reset(new WebMediaPlayerFactory( 180 web_media_player_factory_.reset(new WebMediaPlayerFactory(
179 compositor_thread_.message_loop_proxy(), enable_mojo_media_renderer)); 181 compositor_thread_.message_loop_proxy(), enable_mojo_media_renderer));
180 } 182 }
181 183
182 bool ConfigureIncomingConnection(ApplicationConnection* connection) override { 184 bool ConfigureIncomingConnection(ApplicationConnection* connection) override {
(...skipping 16 matching lines...) Expand all
199 201
200 DISALLOW_COPY_AND_ASSIGN(HTMLViewer); 202 DISALLOW_COPY_AND_ASSIGN(HTMLViewer);
201 }; 203 };
202 204
203 } // namespace html_viewer 205 } // namespace html_viewer
204 206
205 MojoResult MojoMain(MojoHandle shell_handle) { 207 MojoResult MojoMain(MojoHandle shell_handle) {
206 mojo::ApplicationRunnerChromium runner(new html_viewer::HTMLViewer); 208 mojo::ApplicationRunnerChromium runner(new html_viewer::HTMLViewer);
207 return runner.Run(shell_handle); 209 return runner.Run(shell_handle);
208 } 210 }
OLDNEW
« no previous file with comments | « media/mojo/services/mojo_media_application.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698