| 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 <list> | 5 #include <list> |
| 6 #include <set> | 6 #include <set> |
| 7 | 7 |
| 8 #include "base/memory/ref_counted.h" | 8 #include "base/memory/ref_counted.h" |
| 9 #include "base/memory/weak_ptr.h" | 9 #include "base/memory/weak_ptr.h" |
| 10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| (...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 182 content::Details<content::WebContents>(details).ptr()); | 182 content::Details<content::WebContents>(details).ptr()); |
| 183 registrar_.RemoveAll(); | 183 registrar_.RemoveAll(); |
| 184 } | 184 } |
| 185 | 185 |
| 186 virtual void DidStartProvisionalLoadForFrame( | 186 virtual void DidStartProvisionalLoadForFrame( |
| 187 int64 frame_id, | 187 int64 frame_id, |
| 188 int64 parent_frame_id, | 188 int64 parent_frame_id, |
| 189 bool is_main_frame, | 189 bool is_main_frame, |
| 190 const GURL& validated_url, | 190 const GURL& validated_url, |
| 191 bool is_error_page, | 191 bool is_error_page, |
| 192 bool is_iframe_srcdoc, |
| 192 content::RenderViewHost* render_view_host) OVERRIDE { | 193 content::RenderViewHost* render_view_host) OVERRIDE { |
| 193 if (validated_url != delay_url_ || !rvh_) | 194 if (validated_url != delay_url_ || !rvh_) |
| 194 return; | 195 return; |
| 195 | 196 |
| 196 rvh_->ExecuteJavascriptInWebFrame(string16(), UTF8ToUTF16(script_)); | 197 rvh_->ExecuteJavascriptInWebFrame(string16(), UTF8ToUTF16(script_)); |
| 197 script_was_executed_ = true; | 198 script_was_executed_ = true; |
| 198 } | 199 } |
| 199 | 200 |
| 200 virtual void DidCommitProvisionalLoadForFrame( | 201 virtual void DidCommitProvisionalLoadForFrame( |
| 201 int64 frame_id, | 202 int64 frame_id, |
| (...skipping 480 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 682 test_server()->GetURL("test6"), | 683 test_server()->GetURL("test6"), |
| 683 "updateHistory()", | 684 "updateHistory()", |
| 684 extension->GetResourceURL("crossProcess/empty.html")); | 685 extension->GetResourceURL("crossProcess/empty.html")); |
| 685 | 686 |
| 686 ASSERT_TRUE(RunPageTest( | 687 ASSERT_TRUE(RunPageTest( |
| 687 extension->GetResourceURL("test_crossProcessHistory.html").spec())) | 688 extension->GetResourceURL("test_crossProcessHistory.html").spec())) |
| 688 << message_; | 689 << message_; |
| 689 } | 690 } |
| 690 | 691 |
| 691 } // namespace extensions | 692 } // namespace extensions |
| OLD | NEW |