OLD | NEW |
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 1579 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1590 chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel(); | 1590 chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel(); |
1591 return channel <= chrome::VersionInfo::CHANNEL_DEV; | 1591 return channel <= chrome::VersionInfo::CHANNEL_DEV; |
1592 #else | 1592 #else |
1593 return false; | 1593 return false; |
1594 #endif | 1594 #endif |
1595 } | 1595 } |
1596 | 1596 |
1597 content::BrowserPluginDelegate* | 1597 content::BrowserPluginDelegate* |
1598 ChromeContentRendererClient::CreateBrowserPluginDelegate( | 1598 ChromeContentRendererClient::CreateBrowserPluginDelegate( |
1599 content::RenderFrame* render_frame, | 1599 content::RenderFrame* render_frame, |
1600 const std::string& mime_type) { | 1600 const std::string& mime_type, |
| 1601 const GURL& original_url) { |
1601 #if defined(ENABLE_EXTENSIONS) | 1602 #if defined(ENABLE_EXTENSIONS) |
1602 if (mime_type == content::kBrowserPluginMimeType) | 1603 if (mime_type == content::kBrowserPluginMimeType) { |
1603 return new extensions::ExtensionsGuestViewContainer(render_frame); | 1604 return new extensions::ExtensionsGuestViewContainer(render_frame); |
1604 else | 1605 } else { |
1605 return new extensions::MimeHandlerViewContainer(render_frame, mime_type); | 1606 return new extensions::MimeHandlerViewContainer( |
| 1607 render_frame, mime_type, original_url); |
| 1608 } |
1606 #else | 1609 #else |
1607 return NULL; | 1610 return NULL; |
1608 #endif | 1611 #endif |
1609 } | 1612 } |
OLD | NEW |