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, 0, &MinidumpCallback, 0, true, |
Mark Mentovai
2012/07/24 15:27:33
The 0s should all be NULLs, here and in the else b
Robert Sesek
2012/07/24 16:11:14
Done.
| |
186 kFullDumpType, 0, 0); | 186 kFullDumpType, static_cast<const wchar_t*>(0), 0); |
187 } else { | 187 } else { |
188 new google_breakpad::ExceptionHandler( | 188 new google_breakpad::ExceptionHandler( |
189 dir, 0, &MinidumpCallback, 0, true); | 189 dir, 0, &MinidumpCallback, 0, true); |
190 } | 190 } |
191 } | 191 } |
192 } | 192 } |
193 | 193 |
194 void TestShell::DestroyWindow(gfx::NativeWindow windowHandle) { | 194 void TestShell::DestroyWindow(gfx::NativeWindow windowHandle) { |
195 // Do we want to tear down some of the machinery behind the scenes too? | 195 // Do we want to tear down some of the machinery behind the scenes too? |
196 RemoveWindowFromList(windowHandle); | 196 RemoveWindowFromList(windowHandle); |
(...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
733 | 733 |
734 bool EnsureFontLoaded(HFONT font) { | 734 bool EnsureFontLoaded(HFONT font) { |
735 return true; | 735 return true; |
736 } | 736 } |
737 | 737 |
738 bool DownloadUrl(const std::string& url, HWND caller_window) { | 738 bool DownloadUrl(const std::string& url, HWND caller_window) { |
739 return false; | 739 return false; |
740 } | 740 } |
741 | 741 |
742 } // namespace webkit_glue | 742 } // namespace webkit_glue |
OLD | NEW |