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

Side by Side Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 801173002: Fix message routing for BrowserPlugin in iframe (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix tests that don't have a RenderThreadImpl Created 6 years 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/renderer/chrome_content_renderer_client.h" 5 #include "chrome/renderer/chrome_content_renderer_client.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/debug/crash_logging.h" 8 #include "base/debug/crash_logging.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/metrics/field_trial.h" 10 #include "base/metrics/field_trial.h"
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 #include "chrome/renderer/extensions/renderer_permissions_policy_delegate.h" 114 #include "chrome/renderer/extensions/renderer_permissions_policy_delegate.h"
115 #include "chrome/renderer/extensions/resource_request_policy.h" 115 #include "chrome/renderer/extensions/resource_request_policy.h"
116 #include "extensions/common/extension.h" 116 #include "extensions/common/extension.h"
117 #include "extensions/common/extension_set.h" 117 #include "extensions/common/extension_set.h"
118 #include "extensions/common/extension_urls.h" 118 #include "extensions/common/extension_urls.h"
119 #include "extensions/common/switches.h" 119 #include "extensions/common/switches.h"
120 #include "extensions/renderer/dispatcher.h" 120 #include "extensions/renderer/dispatcher.h"
121 #include "extensions/renderer/extension_helper.h" 121 #include "extensions/renderer/extension_helper.h"
122 #include "extensions/renderer/extensions_render_frame_observer.h" 122 #include "extensions/renderer/extensions_render_frame_observer.h"
123 #include "extensions/renderer/guest_view/extensions_guest_view_container.h" 123 #include "extensions/renderer/guest_view/extensions_guest_view_container.h"
124 #include "extensions/renderer/guest_view/guest_view_container.h"
124 #include "extensions/renderer/guest_view/mime_handler_view/mime_handler_view_con tainer.h" 125 #include "extensions/renderer/guest_view/mime_handler_view/mime_handler_view_con tainer.h"
125 #include "extensions/renderer/script_context.h" 126 #include "extensions/renderer/script_context.h"
126 #endif 127 #endif
127 128
128 #if defined(ENABLE_PRINT_PREVIEW) 129 #if defined(ENABLE_PRINT_PREVIEW)
129 #include "chrome/renderer/pepper/chrome_pdf_print_client.h" 130 #include "chrome/renderer/pepper/chrome_pdf_print_client.h"
130 #endif 131 #endif
131 132
132 #if defined(ENABLE_SPELLCHECK) 133 #if defined(ENABLE_SPELLCHECK)
133 #include "chrome/renderer/spellchecker/spellcheck.h" 134 #include "chrome/renderer/spellchecker/spellcheck.h"
(...skipping 1128 matching lines...) Expand 10 before | Expand all | Expand 10 after
1262 // uninstalled. 1263 // uninstalled.
1263 if (frame->top()->document().url() == url) { 1264 if (frame->top()->document().url() == url) {
1264 if (is_extension_url != extension_dispatcher_->is_extension_process()) 1265 if (is_extension_url != extension_dispatcher_->is_extension_process())
1265 return true; 1266 return true;
1266 } 1267 }
1267 #endif // defined(ENABLE_EXTENSIONS) 1268 #endif // defined(ENABLE_EXTENSIONS)
1268 1269
1269 return false; 1270 return false;
1270 } 1271 }
1271 1272
1273 #if defined(ENABLE_EXTENSIONS)
1274 bool ChromeContentRendererClient::ShouldForwardToGuestContainer(
1275 const IPC::Message& msg) {
1276 return extensions::GuestViewContainer::HandlesMessage(msg);
1277 }
1278 #endif
1279
1272 bool ChromeContentRendererClient::WillSendRequest( 1280 bool ChromeContentRendererClient::WillSendRequest(
1273 blink::WebFrame* frame, 1281 blink::WebFrame* frame,
1274 ui::PageTransition transition_type, 1282 ui::PageTransition transition_type,
1275 const GURL& url, 1283 const GURL& url,
1276 const GURL& first_party_for_cookies, 1284 const GURL& first_party_for_cookies,
1277 GURL* new_url) { 1285 GURL* new_url) {
1278 // Check whether the request should be allowed. If not allowed, we reset the 1286 // Check whether the request should be allowed. If not allowed, we reset the
1279 // URL to something invalid to prevent the request and cause an error. 1287 // URL to something invalid to prevent the request and cause an error.
1280 #if defined(ENABLE_EXTENSIONS) 1288 #if defined(ENABLE_EXTENSIONS)
1281 if (url.SchemeIs(extensions::kExtensionScheme) && 1289 if (url.SchemeIs(extensions::kExtensionScheme) &&
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
1576 if (mime_type == content::kBrowserPluginMimeType) { 1584 if (mime_type == content::kBrowserPluginMimeType) {
1577 return new extensions::ExtensionsGuestViewContainer(render_frame); 1585 return new extensions::ExtensionsGuestViewContainer(render_frame);
1578 } else { 1586 } else {
1579 return new extensions::MimeHandlerViewContainer( 1587 return new extensions::MimeHandlerViewContainer(
1580 render_frame, mime_type, original_url); 1588 render_frame, mime_type, original_url);
1581 } 1589 }
1582 #else 1590 #else
1583 return NULL; 1591 return NULL;
1584 #endif 1592 #endif
1585 } 1593 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698