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

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

Issue 464533002: Move guest_view to extensions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Small changes are made in guest_view_manager_unittest.cc Created 6 years, 4 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
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_link_manager.h" 5 #include "chrome/browser/prerender/prerender_link_manager.h"
6 6
7 #include <functional> 7 #include <functional>
8 #include <limits> 8 #include <limits>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 10 matching lines...) Expand all
21 #include "chrome/common/prerender_messages.h" 21 #include "chrome/common/prerender_messages.h"
22 #include "chrome/common/prerender_types.h" 22 #include "chrome/common/prerender_types.h"
23 #include "content/public/browser/render_process_host.h" 23 #include "content/public/browser/render_process_host.h"
24 #include "content/public/browser/render_view_host.h" 24 #include "content/public/browser/render_view_host.h"
25 #include "content/public/browser/session_storage_namespace.h" 25 #include "content/public/browser/session_storage_namespace.h"
26 #include "content/public/common/referrer.h" 26 #include "content/public/common/referrer.h"
27 #include "ui/gfx/size.h" 27 #include "ui/gfx/size.h"
28 #include "url/gurl.h" 28 #include "url/gurl.h"
29 29
30 #if defined(ENABLE_EXTENSIONS) 30 #if defined(ENABLE_EXTENSIONS)
31 #include "chrome/browser/guest_view/guest_view_base.h" 31 #include "extensions/browser/guest_view/guest_view_base.h"
32 #endif 32 #endif
33 33
34 using base::TimeDelta; 34 using base::TimeDelta;
35 using base::TimeTicks; 35 using base::TimeTicks;
36 using content::RenderViewHost; 36 using content::RenderViewHost;
37 using content::SessionStorageNamespace; 37 using content::SessionStorageNamespace;
38 38
39 namespace prerender { 39 namespace prerender {
40 40
41 namespace { 41 namespace {
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 FindByLauncherChildIdAndPrerenderId(launcher_child_id, 170 FindByLauncherChildIdAndPrerenderId(launcher_child_id,
171 prerender_id)); 171 prerender_id));
172 172
173 #if defined(ENABLE_EXTENSIONS) 173 #if defined(ENABLE_EXTENSIONS)
174 content::RenderViewHost* rvh = 174 content::RenderViewHost* rvh =
175 content::RenderViewHost::FromID(launcher_child_id, render_view_route_id); 175 content::RenderViewHost::FromID(launcher_child_id, render_view_route_id);
176 content::WebContents* web_contents = 176 content::WebContents* web_contents =
177 rvh ? content::WebContents::FromRenderViewHost(rvh) : NULL; 177 rvh ? content::WebContents::FromRenderViewHost(rvh) : NULL;
178 // Guests inside <webview> do not support cross-process navigation and so we 178 // Guests inside <webview> do not support cross-process navigation and so we
179 // do not allow guests to prerender content. 179 // do not allow guests to prerender content.
180 if (GuestViewBase::IsGuest(web_contents)) 180 if (extensions::GuestViewBase::IsGuest(web_contents))
181 return; 181 return;
182 #endif 182 #endif
183 183
184 // Check if the launcher is itself an unswapped prerender. 184 // Check if the launcher is itself an unswapped prerender.
185 PrerenderContents* prerender_contents = 185 PrerenderContents* prerender_contents =
186 manager_->GetPrerenderContentsForRoute(launcher_child_id, 186 manager_->GetPrerenderContentsForRoute(launcher_child_id,
187 render_view_route_id); 187 render_view_route_id);
188 if (prerender_contents && 188 if (prerender_contents &&
189 prerender_contents->final_status() != FINAL_STATUS_MAX) { 189 prerender_contents->final_status() != FINAL_STATUS_MAX) {
190 // The launcher is a prerender about to be destroyed asynchronously, but 190 // The launcher is a prerender about to be destroyed asynchronously, but
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after
540 DCHECK(!prerender->is_match_complete_replacement); 540 DCHECK(!prerender->is_match_complete_replacement);
541 prerender->is_match_complete_replacement = true; 541 prerender->is_match_complete_replacement = true;
542 Send(prerender->launcher_child_id, 542 Send(prerender->launcher_child_id,
543 new PrerenderMsg_OnPrerenderStop(prerender->prerender_id)); 543 new PrerenderMsg_OnPrerenderStop(prerender->prerender_id));
544 // Do not call RemovePrerender here. The replacement needs to stay connected 544 // Do not call RemovePrerender here. The replacement needs to stay connected
545 // to the HTMLLinkElement in the renderer so it notices renderer-triggered 545 // to the HTMLLinkElement in the renderer so it notices renderer-triggered
546 // cancelations. 546 // cancelations.
547 } 547 }
548 548
549 } // namespace prerender 549 } // namespace prerender
OLDNEW
« no previous file with comments | « chrome/browser/plugins/plugin_info_message_filter.cc ('k') | chrome/browser/profiles/off_the_record_profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698