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

Side by Side Diff: chrome/app/chrome_dll_main.cc

Issue 1995005: Allows browser tests to run with recent change (Closed)
Patch Set: Created 10 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/boot_times_loader.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 (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 // TODO(port): the ifdefs in here are a first step towards trying to determine 5 // TODO(port): the ifdefs in here are a first step towards trying to determine
6 // the correct abstraction for all the OS functionality required at this 6 // the correct abstraction for all the OS functionality required at this
7 // stage of process initialization. It should not be taken as a final 7 // stage of process initialization. It should not be taken as a final
8 // abstraction. 8 // abstraction.
9 9
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 392
393 #if defined(OS_WIN) 393 #if defined(OS_WIN)
394 DLLEXPORT int __cdecl ChromeMain(HINSTANCE instance, 394 DLLEXPORT int __cdecl ChromeMain(HINSTANCE instance,
395 sandbox::SandboxInterfaceInfo* sandbox_info, 395 sandbox::SandboxInterfaceInfo* sandbox_info,
396 TCHAR* command_line) { 396 TCHAR* command_line) {
397 #elif defined(OS_POSIX) 397 #elif defined(OS_POSIX)
398 int ChromeMain(int argc, char** argv) { 398 int ChromeMain(int argc, char** argv) {
399 #endif 399 #endif
400 #if defined(OS_CHROMEOS) 400 #if defined(OS_CHROMEOS)
401 // Output our start times. 401 // Output our start times.
402 system("set -o noclobber ; cat /proc/uptime > /tmp/uptime-chrome-main"); 402 system("if [ ! -f /tmp/uptime-chrome-main ]; "
403 system("set -o noclobber ; cat /sys/block/sda/stat > /tmp/disk-chrome-main"); 403 "then cat /proc/uptime > /tmp/uptime-chrome-main ; fi");
404 system("if [ ! -f /tmp/disk-chrome-main ]; "
405 "then cat /sys/block/sda/stat > /tmp/disk-chrome-main ; fi");
404 #endif 406 #endif
405 #if defined(OS_MACOSX) 407 #if defined(OS_MACOSX)
406 // TODO(mark): Some of these things ought to be handled in chrome_exe_main.mm. 408 // TODO(mark): Some of these things ought to be handled in chrome_exe_main.mm.
407 // Under the current architecture, nothing in chrome_exe_main can rely 409 // Under the current architecture, nothing in chrome_exe_main can rely
408 // directly on chrome_dll code on the Mac, though, so until some of this code 410 // directly on chrome_dll code on the Mac, though, so until some of this code
409 // is refactored to avoid such a dependency, it lives here. See also the 411 // is refactored to avoid such a dependency, it lives here. See also the
410 // TODO(mark) below at InitCrashReporter() and DestructCrashReporter(). 412 // TODO(mark) below at InitCrashReporter() and DestructCrashReporter().
411 base::EnableTerminationOnHeapCorruption(); 413 base::EnableTerminationOnHeapCorruption();
412 base::EnableTerminationOnOutOfMemory(); 414 base::EnableTerminationOnOutOfMemory();
413 #endif // OS_MACOSX 415 #endif // OS_MACOSX
(...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after
833 835
834 logging::CleanupChromeLogging(); 836 logging::CleanupChromeLogging();
835 837
836 #if defined(OS_MACOSX) && defined(GOOGLE_CHROME_BUILD) 838 #if defined(OS_MACOSX) && defined(GOOGLE_CHROME_BUILD)
837 // TODO(mark): See the TODO(mark) above at InitCrashReporter. 839 // TODO(mark): See the TODO(mark) above at InitCrashReporter.
838 DestructCrashReporter(); 840 DestructCrashReporter();
839 #endif // OS_MACOSX && GOOGLE_CHROME_BUILD 841 #endif // OS_MACOSX && GOOGLE_CHROME_BUILD
840 842
841 return rv; 843 return rv;
842 } 844 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/boot_times_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698