Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Side by Side Diff: chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc

Issue 11090068: When starting a provisional load include the parent frame ID in the IPC and pass it down the th WCO… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updatess Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 NOTREACHED(); 177 NOTREACHED();
178 return; 178 return;
179 } 179 }
180 content::WebContentsObserver::Observe( 180 content::WebContentsObserver::Observe(
181 content::Details<content::WebContents>(details).ptr()); 181 content::Details<content::WebContents>(details).ptr());
182 registrar_.RemoveAll(); 182 registrar_.RemoveAll();
183 } 183 }
184 184
185 virtual void DidStartProvisionalLoadForFrame( 185 virtual void DidStartProvisionalLoadForFrame(
186 int64 frame_id, 186 int64 frame_id,
187 int64 parent_frame_id,
187 bool is_main_frame, 188 bool is_main_frame,
188 const GURL& validated_url, 189 const GURL& validated_url,
189 bool is_error_page, 190 bool is_error_page,
190 content::RenderViewHost* render_view_host) OVERRIDE { 191 content::RenderViewHost* render_view_host) OVERRIDE {
191 if (validated_url != delay_url_ || !rvh_) 192 if (validated_url != delay_url_ || !rvh_)
192 return; 193 return;
193 194
194 rvh_->ExecuteJavascriptInWebFrame(string16(), UTF8ToUTF16(script_)); 195 rvh_->ExecuteJavascriptInWebFrame(string16(), UTF8ToUTF16(script_));
195 script_was_executed_ = true; 196 script_was_executed_ = true;
196 } 197 }
(...skipping 478 matching lines...) Expand 10 before | Expand all | Expand 10 after
675 test_server()->GetURL("test6"), 676 test_server()->GetURL("test6"),
676 "updateHistory()", 677 "updateHistory()",
677 extension->GetResourceURL("crossProcess/empty.html")); 678 extension->GetResourceURL("crossProcess/empty.html"));
678 679
679 ASSERT_TRUE(RunPageTest( 680 ASSERT_TRUE(RunPageTest(
680 extension->GetResourceURL("test_crossProcessHistory.html").spec())) 681 extension->GetResourceURL("test_crossProcessHistory.html").spec()))
681 << message_; 682 << message_;
682 } 683 }
683 684
684 } // namespace extensions 685 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/web_navigation/web_navigation_api.cc ('k') | chrome/browser/net/load_time_stats.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698