OLD | NEW |
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 "webkit/tools/test_shell/test_shell.h" | 5 #include "webkit/tools/test_shell/test_shell.h" |
6 | 6 |
7 #include <windows.h> | 7 #include <windows.h> |
8 #include <commdlg.h> | 8 #include <commdlg.h> |
9 #include <objbase.h> | 9 #include <objbase.h> |
10 #include <process.h> | 10 #include <process.h> |
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
175 HANDLE rc = AddFontMemResourceEx(font_ptr, font_size, 0, &num_fonts); | 175 HANDLE rc = AddFontMemResourceEx(font_ptr, font_size, 0, &num_fonts); |
176 DCHECK(rc != 0); | 176 DCHECK(rc != 0); |
177 } | 177 } |
178 | 178 |
179 const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess(); | 179 const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess(); |
180 if (parsed_command_line.HasSwitch(test_shell::kCrashDumps)) { | 180 if (parsed_command_line.HasSwitch(test_shell::kCrashDumps)) { |
181 string16 dir( | 181 string16 dir( |
182 parsed_command_line.GetSwitchValueNative(test_shell::kCrashDumps)); | 182 parsed_command_line.GetSwitchValueNative(test_shell::kCrashDumps)); |
183 if (parsed_command_line.HasSwitch(test_shell::kCrashDumpsFulldump)) { | 183 if (parsed_command_line.HasSwitch(test_shell::kCrashDumpsFulldump)) { |
184 new google_breakpad::ExceptionHandler( | 184 new google_breakpad::ExceptionHandler( |
185 dir, 0, &MinidumpCallback, 0, true, | 185 dir, // dump_path |
186 kFullDumpType, 0, 0); | 186 NULL, // filter |
| 187 &MinidumpCallback, // callback |
| 188 NULL, // callback_context |
| 189 google_breakpad::ExceptionHandler::HANDLER_ALL, // handler_types |
| 190 kFullDumpType, // dump_type |
| 191 static_cast<const wchar_t*>(NULL), // pipe_name |
| 192 NULL); // custom_info |
187 } else { | 193 } else { |
188 new google_breakpad::ExceptionHandler( | 194 new google_breakpad::ExceptionHandler( |
189 dir, 0, &MinidumpCallback, 0, true); | 195 dir, // dump_path |
| 196 NULL, // filter |
| 197 &MinidumpCallback, // callback |
| 198 NULL, // callback_context |
| 199 google_breakpad::ExceptionHandler::HANDLER_ALL); // handler_tpes |
190 } | 200 } |
191 } | 201 } |
192 } | 202 } |
193 | 203 |
194 void TestShell::DestroyWindow(gfx::NativeWindow windowHandle) { | 204 void TestShell::DestroyWindow(gfx::NativeWindow windowHandle) { |
195 // Do we want to tear down some of the machinery behind the scenes too? | 205 // Do we want to tear down some of the machinery behind the scenes too? |
196 RemoveWindowFromList(windowHandle); | 206 RemoveWindowFromList(windowHandle); |
197 ::DestroyWindow(windowHandle); | 207 ::DestroyWindow(windowHandle); |
198 } | 208 } |
199 | 209 |
(...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
733 | 743 |
734 bool EnsureFontLoaded(HFONT font) { | 744 bool EnsureFontLoaded(HFONT font) { |
735 return true; | 745 return true; |
736 } | 746 } |
737 | 747 |
738 bool DownloadUrl(const std::string& url, HWND caller_window) { | 748 bool DownloadUrl(const std::string& url, HWND caller_window) { |
739 return false; | 749 return false; |
740 } | 750 } |
741 | 751 |
742 } // namespace webkit_glue | 752 } // namespace webkit_glue |
OLD | NEW |