diff options
| author | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-20 18:33:30 +0000 |
|---|---|---|
| committer | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-20 18:33:30 +0000 |
| commit | 09cce462153d6b99d4bc1555a5e6545599b96c09 (patch) | |
| tree | 813102d930a573d8411df486df351609162053e3 /chrome/renderer | |
| parent | ce42088b0d04b3abb385f81a067bf33005b0808d (diff) | |
| download | chromium_src-09cce462153d6b99d4bc1555a5e6545599b96c09.zip chromium_src-09cce462153d6b99d4bc1555a5e6545599b96c09.tar.gz chromium_src-09cce462153d6b99d4bc1555a5e6545599b96c09.tar.bz2 | |
Revert 157773 - This is followup from Charlie's comments on Fady's cl: http://chromiumcodereview.appspot.com/10560022, it seems I cannot upload patch to that issue (since I'm not owner), I'm creating a new one.
NavigateGuest is flaky on windows (crashes at shutdown)
Split Embedder and Guest 'roles' for browser plugin, web contents can now play any or both roles, main idea is to have more readable separation between the two.
Also stop creating browser_plugin counterpart in browser/host for every web_contents, instead create them only when there's a browser_plugin element.
BUG= 141232
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=157650
Review URL: https://chromiumcodereview.appspot.com/10868012
TBR=lazyboy@chromium.org
Review URL: https://codereview.chromium.org/10968015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157801 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/chrome_content_renderer_client.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc index c692fa2..40c9c1b 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -316,12 +316,10 @@ bool ChromeContentRendererClient::OverrideCreatePlugin( std::string actual_mime_type; std::string orig_mime_type = params.mimeType.utf8(); - if (orig_mime_type == content::kBrowserPluginNewMimeType || - ((orig_mime_type == content::kBrowserPluginMimeType) && - extensions::ExtensionHelper::Get(render_view)->view_type() == - VIEW_TYPE_APP_SHELL)) { + if (orig_mime_type == content::kBrowserPluginMimeType && + extensions::ExtensionHelper::Get(render_view)->view_type() == + VIEW_TYPE_APP_SHELL) return false; - } render_view->Send(new ChromeViewHostMsg_GetPluginInfo( render_view->GetRoutingID(), GURL(params.url), |