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

Side by Side Diff: plugin/cross/main.cc

Issue 5651002: Fix debug.log creation, which has been broken since r58501.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/o3d/
Patch Set: Created 10 years 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 | « no previous file | 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 /* 1 /*
2 * Copyright 2009, Google Inc. 2 * Copyright 2009, Google Inc.
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 if (err != NPERR_NO_ERROR) { 325 if (err != NPERR_NO_ERROR) {
326 return err; 326 return err;
327 } 327 }
328 328
329 #if !defined(O3D_INTERNAL_PLUGIN) 329 #if !defined(O3D_INTERNAL_PLUGIN)
330 // Turn on the logging. 330 // Turn on the logging.
331 CommandLine::Init(0, NULL); 331 CommandLine::Init(0, NULL);
332 332
333 FilePath log; 333 FilePath log;
334 file_util::GetTempDir(&log); 334 file_util::GetTempDir(&log);
335 log.Append(O3D_DEBUG_LOG_FILENAME); 335 log = log.Append(O3D_DEBUG_LOG_FILENAME);
336 336
337 InitLogging(log.value().c_str(), 337 InitLogging(log.value().c_str(),
338 logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG, 338 logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG,
339 logging::DONT_LOCK_LOG_FILE, 339 logging::DONT_LOCK_LOG_FILE,
340 logging::APPEND_TO_OLD_LOG_FILE); 340 logging::APPEND_TO_OLD_LOG_FILE);
341 #endif // O3D_INTERNAL_PLUGIN 341 #endif // O3D_INTERNAL_PLUGIN
342 342
343 DLOG(INFO) << "NP_Initialize"; 343 DLOG(INFO) << "NP_Initialize";
344 344
345 return o3d::PlatformPostNPInitialize(); 345 return o3d::PlatformPostNPInitialize();
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
410 } // namespace o3d / extern "C" 410 } // namespace o3d / extern "C"
411 411
412 #if !defined(O3D_INTERNAL_PLUGIN) 412 #if !defined(O3D_INTERNAL_PLUGIN)
413 extern "C" { 413 extern "C" {
414 NPError EXPORT_SYMBOL NP_GetValue(void *instance, NPPVariable variable, 414 NPError EXPORT_SYMBOL NP_GetValue(void *instance, NPPVariable variable,
415 void *value) { 415 void *value) {
416 return o3d::NP_GetValue(variable, value); 416 return o3d::NP_GetValue(variable, value);
417 } 417 }
418 } 418 }
419 #endif 419 #endif
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698