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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 9838033: Upstream native crash handling changes for Android. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: In response to comments. Lots of linux to posix Created 8 years, 8 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 663 matching lines...) Expand 10 before | Expand all | Expand 10 after
674 return false; 674 return false;
675 } 675 }
676 676
677 std::string ChromeContentBrowserClient::GetCanonicalEncodingNameByAliasName( 677 std::string ChromeContentBrowserClient::GetCanonicalEncodingNameByAliasName(
678 const std::string& alias_name) { 678 const std::string& alias_name) {
679 return CharacterEncoding::GetCanonicalEncodingNameByAliasName(alias_name); 679 return CharacterEncoding::GetCanonicalEncodingNameByAliasName(alias_name);
680 } 680 }
681 681
682 void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( 682 void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
683 CommandLine* command_line, int child_process_id) { 683 CommandLine* command_line, int child_process_id) {
684 #if defined(USE_LINUX_BREAKPAD) 684 #if defined(USE_POSIX_BREAKPAD)
685 if (IsCrashReporterEnabled()) { 685 if (IsCrashReporterEnabled()) {
686 command_line->AppendSwitchASCII(switches::kEnableCrashReporter, 686 command_line->AppendSwitchASCII(switches::kEnableCrashReporter,
687 child_process_logging::GetClientId() + "," + base::GetLinuxDistro()); 687 child_process_logging::GetClientId() + "," + base::GetLinuxDistro());
688 } 688 }
689 #elif defined(OS_MACOSX) 689 #elif defined(OS_MACOSX)
690 if (IsCrashReporterEnabled()) { 690 if (IsCrashReporterEnabled()) {
691 command_line->AppendSwitchASCII(switches::kEnableCrashReporter, 691 command_line->AppendSwitchASCII(switches::kEnableCrashReporter,
692 child_process_logging::GetClientId()); 692 child_process_logging::GetClientId());
693 } 693 }
694 #endif // OS_MACOSX 694 #endif // OS_MACOSX
(...skipping 886 matching lines...) Expand 10 before | Expand all | Expand 10 after
1581 if (extension->HasAPIPermission(ExtensionAPIPermission::kSocket)) 1581 if (extension->HasAPIPermission(ExtensionAPIPermission::kSocket))
1582 return true; 1582 return true;
1583 1583
1584 return false; 1584 return false;
1585 } 1585 }
1586 1586
1587 #if defined(OS_POSIX) && !defined(OS_MACOSX) 1587 #if defined(OS_POSIX) && !defined(OS_MACOSX)
1588 int ChromeContentBrowserClient::GetCrashSignalFD( 1588 int ChromeContentBrowserClient::GetCrashSignalFD(
1589 const CommandLine& command_line) { 1589 const CommandLine& command_line) {
1590 #if defined(OS_ANDROID) 1590 #if defined(OS_ANDROID)
1591 // TODO(carlosvaldivia): Upstream breakpad code for Android and remove this 1591 // TODO(carlosvaldivia): Upstream breakpad code for Android and remove this
Yaron 2012/04/03 23:54:20 This needs to be removed. Also tag this patch with
carlosvaldivia 2012/04/04 20:52:34 Done.
1592 // fork. http://crbug.com/113560 1592 // fork. http://crbug.com/113560
1593 NOTIMPLEMENTED(); 1593 NOTIMPLEMENTED();
1594 #else 1594 #else
1595 if (command_line.HasSwitch(switches::kExtensionProcess)) { 1595 if (command_line.HasSwitch(switches::kExtensionProcess)) {
1596 ExtensionCrashHandlerHostLinux* crash_handler = 1596 ExtensionCrashHandlerHostLinux* crash_handler =
1597 ExtensionCrashHandlerHostLinux::GetInstance(); 1597 ExtensionCrashHandlerHostLinux::GetInstance();
1598 return crash_handler->GetDeathSignalSocket(); 1598 return crash_handler->GetDeathSignalSocket();
1599 } 1599 }
1600 1600
1601 std::string process_type = 1601 std::string process_type =
(...skipping 25 matching lines...) Expand all
1627 #if defined(USE_NSS) 1627 #if defined(USE_NSS)
1628 crypto::CryptoModuleBlockingPasswordDelegate* 1628 crypto::CryptoModuleBlockingPasswordDelegate*
1629 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 1629 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
1630 const GURL& url) { 1630 const GURL& url) {
1631 return browser::NewCryptoModuleBlockingDialogDelegate( 1631 return browser::NewCryptoModuleBlockingDialogDelegate(
1632 browser::kCryptoModulePasswordKeygen, url.host()); 1632 browser::kCryptoModulePasswordKeygen, url.host());
1633 } 1633 }
1634 #endif 1634 #endif
1635 1635
1636 } // namespace chrome 1636 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698