| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/browser/layout_test/blink_test_controller.h" | 5 #include "content/shell/browser/layout_test/blink_test_controller.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <iostream> | 9 #include <iostream> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 465 base::Bind(base::IgnoreResult(&BlinkTestController::DiscardMainWindow), | 465 base::Bind(base::IgnoreResult(&BlinkTestController::DiscardMainWindow), |
| 466 base::Unretained(this))); | 466 base::Unretained(this))); |
| 467 } | 467 } |
| 468 | 468 |
| 469 void BlinkTestController::RenderFrameCreated( | 469 void BlinkTestController::RenderFrameCreated( |
| 470 RenderFrameHost* render_frame_host) { | 470 RenderFrameHost* render_frame_host) { |
| 471 DCHECK(CalledOnValidThread()); | 471 DCHECK(CalledOnValidThread()); |
| 472 HandleNewRenderFrameHost(render_frame_host); | 472 HandleNewRenderFrameHost(render_frame_host); |
| 473 } | 473 } |
| 474 | 474 |
| 475 void BlinkTestController::RenderFrameHostChanged(RenderFrameHost* old_host, | |
| 476 RenderFrameHost* new_host) { | |
| 477 DCHECK(CalledOnValidThread()); | |
| 478 HandleNewRenderFrameHost(new_host); | |
| 479 } | |
| 480 | |
| 481 void BlinkTestController::DevToolsProcessCrashed() { | 475 void BlinkTestController::DevToolsProcessCrashed() { |
| 482 DCHECK(CalledOnValidThread()); | 476 DCHECK(CalledOnValidThread()); |
| 483 printer_->AddErrorMessage("#CRASHED - devtools"); | 477 printer_->AddErrorMessage("#CRASHED - devtools"); |
| 484 if (devtools_frontend_) | 478 if (devtools_frontend_) |
| 485 devtools_frontend_->Close(); | 479 devtools_frontend_->Close(); |
| 486 devtools_frontend_ = NULL; | 480 devtools_frontend_ = NULL; |
| 487 } | 481 } |
| 488 | 482 |
| 489 void BlinkTestController::WebContentsDestroyed() { | 483 void BlinkTestController::WebContentsDestroyed() { |
| 490 DCHECK(CalledOnValidThread()); | 484 DCHECK(CalledOnValidThread()); |
| (...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 933 } else { | 927 } else { |
| 934 printer_->AddErrorMessage(base::StringPrintf( | 928 printer_->AddErrorMessage(base::StringPrintf( |
| 935 "FAIL: Unexpected sendBluetoothManualChooserEvent() event name '%s'.", | 929 "FAIL: Unexpected sendBluetoothManualChooserEvent() event name '%s'.", |
| 936 event_name.c_str())); | 930 event_name.c_str())); |
| 937 return; | 931 return; |
| 938 } | 932 } |
| 939 bluetooth_chooser_factory_->SendEvent(event, argument); | 933 bluetooth_chooser_factory_->SendEvent(event, argument); |
| 940 } | 934 } |
| 941 | 935 |
| 942 } // namespace content | 936 } // namespace content |
| OLD | NEW |