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 "content/shell/webkit_test_controller.h" | 5 #include "content/shell/webkit_test_controller.h" |
6 | 6 |
7 #include <iostream> | 7 #include <iostream> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/file_util.h" | 10 #include "base/file_util.h" |
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
250 IPC_MESSAGE_HANDLER(ShellViewHostMsg_CanOpenWindows, OnCanOpenWindows) | 250 IPC_MESSAGE_HANDLER(ShellViewHostMsg_CanOpenWindows, OnCanOpenWindows) |
251 IPC_MESSAGE_HANDLER(ShellViewHostMsg_ShowWebInspector, OnShowWebInspector) | 251 IPC_MESSAGE_HANDLER(ShellViewHostMsg_ShowWebInspector, OnShowWebInspector) |
252 IPC_MESSAGE_HANDLER(ShellViewHostMsg_CloseWebInspector, OnCloseWebInspector) | 252 IPC_MESSAGE_HANDLER(ShellViewHostMsg_CloseWebInspector, OnCloseWebInspector) |
253 IPC_MESSAGE_HANDLER(ShellViewHostMsg_NotImplemented, OnNotImplemented) | 253 IPC_MESSAGE_HANDLER(ShellViewHostMsg_NotImplemented, OnNotImplemented) |
254 IPC_MESSAGE_UNHANDLED(handled = false) | 254 IPC_MESSAGE_UNHANDLED(handled = false) |
255 IPC_END_MESSAGE_MAP() | 255 IPC_END_MESSAGE_MAP() |
256 | 256 |
257 return handled; | 257 return handled; |
258 } | 258 } |
259 | 259 |
260 void WebKitTestController::PluginCrashed(const FilePath& plugin_path) { | 260 void WebKitTestController::PluginCrashed(const FilePath& plugin_path, |
261 base::ProcessId plugin_pid) { | |
261 DCHECK(CalledOnValidThread()); | 262 DCHECK(CalledOnValidThread()); |
262 printer_->AddErrorMessage("#CRASHED - plugin"); | 263 printer_->AddErrorMessage("#CRASHED - plugin"); |
jochen (gone - plz use gerrit)
2013/01/09 08:29:12
can you change the message to "#CRASHED - plugin (
yzshen1
2013/01/09 18:48:11
Done.
| |
263 } | 264 } |
264 | 265 |
265 void WebKitTestController::RenderViewCreated(RenderViewHost* render_view_host) { | 266 void WebKitTestController::RenderViewCreated(RenderViewHost* render_view_host) { |
266 DCHECK(CalledOnValidThread()); | 267 DCHECK(CalledOnValidThread()); |
267 render_view_host->Send(new ShellViewMsg_SetCurrentWorkingDirectory( | 268 render_view_host->Send(new ShellViewMsg_SetCurrentWorkingDirectory( |
268 render_view_host->GetRoutingID(), current_working_directory_)); | 269 render_view_host->GetRoutingID(), current_working_directory_)); |
269 } | 270 } |
270 | 271 |
271 void WebKitTestController::RenderViewGone(base::TerminationStatus status) { | 272 void WebKitTestController::RenderViewGone(base::TerminationStatus status) { |
272 DCHECK(CalledOnValidThread()); | 273 DCHECK(CalledOnValidThread()); |
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
457 | 458 |
458 void WebKitTestController::OnNotImplemented( | 459 void WebKitTestController::OnNotImplemented( |
459 const std::string& object_name, | 460 const std::string& object_name, |
460 const std::string& property_name) { | 461 const std::string& property_name) { |
461 printer_->AddErrorMessage( | 462 printer_->AddErrorMessage( |
462 std::string("FAIL: NOT IMPLEMENTED: ") + | 463 std::string("FAIL: NOT IMPLEMENTED: ") + |
463 object_name + "." + property_name); | 464 object_name + "." + property_name); |
464 } | 465 } |
465 | 466 |
466 } // namespace content | 467 } // namespace content |
OLD | NEW |