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

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

Issue 2123073002: Switch chrome_elf exception handling from breakpad to crashpad (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased to tip and git cl format Created 4 years, 5 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 | « chrome/browser/BUILD.gn ('k') | chrome/browser/crash_upload_list/crash_upload_list_crashpad.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) 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_browser_main_win.h" 5 #include "chrome/browser/chrome_browser_main_win.h"
6 6
7 #include <shellapi.h> 7 #include <shellapi.h>
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <windows.h> 9 #include <windows.h>
10 10
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 76
77 namespace { 77 namespace {
78 78
79 typedef HRESULT (STDAPICALLTYPE* RegisterApplicationRestartProc)( 79 typedef HRESULT (STDAPICALLTYPE* RegisterApplicationRestartProc)(
80 const wchar_t* command_line, 80 const wchar_t* command_line,
81 DWORD flags); 81 DWORD flags);
82 82
83 void InitializeWindowProcExceptions() { 83 void InitializeWindowProcExceptions() {
84 // Get the breakpad pointer from chrome.exe 84 // Get the breakpad pointer from chrome.exe
85 base::win::WinProcExceptionFilter exception_filter = 85 base::win::WinProcExceptionFilter exception_filter =
86 reinterpret_cast<base::win::WinProcExceptionFilter>( 86 reinterpret_cast<base::win::WinProcExceptionFilter>(::GetProcAddress(
87 ::GetProcAddress(::GetModuleHandle( 87 ::GetModuleHandle(chrome::kChromeElfDllName), "CrashForException"));
88 chrome::kBrowserProcessExecutableName), 88 CHECK(exception_filter);
89 "CrashForException"));
90 exception_filter = base::win::SetWinProcExceptionFilter(exception_filter); 89 exception_filter = base::win::SetWinProcExceptionFilter(exception_filter);
91 DCHECK(!exception_filter); 90 DCHECK(!exception_filter);
92 } 91 }
93 92
94 // gfx::Font callbacks 93 // gfx::Font callbacks
95 void AdjustUIFont(LOGFONT* logfont) { 94 void AdjustUIFont(LOGFONT* logfont) {
96 l10n_util::AdjustUIFont(logfont); 95 l10n_util::AdjustUIFont(logfont);
97 } 96 }
98 97
99 int GetMinimumFontSize() { 98 int GetMinimumFontSize() {
(...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after
520 if (resource_id) 519 if (resource_id)
521 return l10n_util::GetStringUTF16(resource_id); 520 return l10n_util::GetStringUTF16(resource_id);
522 return base::string16(); 521 return base::string16();
523 } 522 }
524 523
525 // static 524 // static
526 void ChromeBrowserMainPartsWin::SetupInstallerUtilStrings() { 525 void ChromeBrowserMainPartsWin::SetupInstallerUtilStrings() {
527 CR_DEFINE_STATIC_LOCAL(TranslationDelegate, delegate, ()); 526 CR_DEFINE_STATIC_LOCAL(TranslationDelegate, delegate, ());
528 installer::SetTranslationDelegate(&delegate); 527 installer::SetTranslationDelegate(&delegate);
529 } 528 }
OLDNEW
« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/browser/crash_upload_list/crash_upload_list_crashpad.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698