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

Side by Side Diff: chrome/browser/prerender/prerender_contents.cc

Issue 10933065: Separate same domain and cross domain <link rel=...> prerenders for reporting. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: fix rebase... Created 8 years, 3 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 "chrome/browser/prerender/prerender_contents.h" 5 #include "chrome/browser/prerender/prerender_contents.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <functional> 8 #include <functional>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 DCHECK(child_id_ == -1 || session_storage_namespace); 220 DCHECK(child_id_ == -1 || session_storage_namespace);
221 221
222 std::vector<PendingPrerenderInfo> pending_prerender_list; 222 std::vector<PendingPrerenderInfo> pending_prerender_list;
223 pending_prerender_list.swap(pending_prerenders_); 223 pending_prerender_list.swap(pending_prerenders_);
224 for (std::vector<PendingPrerenderInfo>::iterator it = 224 for (std::vector<PendingPrerenderInfo>::iterator it =
225 pending_prerender_list.begin(); 225 pending_prerender_list.begin();
226 it != pending_prerender_list.end(); 226 it != pending_prerender_list.end();
227 ++it) { 227 ++it) {
228 if (it->weak_prerender_handle && it->weak_prerender_handle->IsValid()) { 228 if (it->weak_prerender_handle && it->weak_prerender_handle->IsValid()) {
229 prerender_manager_->StartPendingPrerender( 229 prerender_manager_->StartPendingPrerender(
230 it->weak_prerender_handle.get(), ORIGIN_LINK_REL_PRERENDER, child_id_, 230 it->weak_prerender_handle.get(),
231 ORIGIN_LINK_REL_PRERENDER_CROSSDOMAIN,
dominich 2012/09/13 20:03:36 this isn't necessarily true. Pending prerenders ca
gavinp 2012/09/14 02:00:42 Good catch. Done.
232 child_id_,
231 it->url, it->referrer, it->size, session_storage_namespace); 233 it->url, it->referrer, it->size, session_storage_namespace);
232 } 234 }
233 } 235 }
234 } 236 }
235 237
236 PrerenderContents::PendingPrerenderInfo::PendingPrerenderInfo( 238 PrerenderContents::PendingPrerenderInfo::PendingPrerenderInfo(
237 const base::WeakPtr<PrerenderHandle> weak_prerender_handle, 239 const base::WeakPtr<PrerenderHandle> weak_prerender_handle,
238 const GURL& url, 240 const GURL& url,
239 const content::Referrer& referrer, 241 const content::Referrer& referrer,
240 const gfx::Size& size) 242 const gfx::Size& size)
(...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after
718 bool PrerenderContents::IsCrossSiteNavigationPending() const { 720 bool PrerenderContents::IsCrossSiteNavigationPending() const {
719 if (!prerender_contents_.get() || !prerender_contents_->web_contents()) 721 if (!prerender_contents_.get() || !prerender_contents_->web_contents())
720 return false; 722 return false;
721 const WebContents* web_contents = prerender_contents_->web_contents(); 723 const WebContents* web_contents = prerender_contents_->web_contents();
722 return (web_contents->GetSiteInstance() != 724 return (web_contents->GetSiteInstance() !=
723 web_contents->GetPendingSiteInstance()); 725 web_contents->GetPendingSiteInstance());
724 } 726 }
725 727
726 728
727 } // namespace prerender 729 } // namespace prerender
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698