| 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 1568 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1579 chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel(); | 1579 chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel(); |
| 1580 return channel <= chrome::VersionInfo::CHANNEL_DEV; | 1580 return channel <= chrome::VersionInfo::CHANNEL_DEV; |
| 1581 #else | 1581 #else |
| 1582 return false; | 1582 return false; |
| 1583 #endif | 1583 #endif |
| 1584 } | 1584 } |
| 1585 | 1585 |
| 1586 content::BrowserPluginDelegate* | 1586 content::BrowserPluginDelegate* |
| 1587 ChromeContentRendererClient::CreateBrowserPluginDelegate( | 1587 ChromeContentRendererClient::CreateBrowserPluginDelegate( |
| 1588 content::RenderFrame* render_frame, | 1588 content::RenderFrame* render_frame, |
| 1589 const std::string& mime_type) { | 1589 const std::string& mime_type, |
| 1590 const GURL& original_url) { |
| 1590 #if defined(ENABLE_EXTENSIONS) | 1591 #if defined(ENABLE_EXTENSIONS) |
| 1591 if (mime_type == content::kBrowserPluginMimeType) | 1592 if (mime_type == content::kBrowserPluginMimeType) { |
| 1592 return new extensions::ExtensionsGuestViewContainer(render_frame); | 1593 return new extensions::ExtensionsGuestViewContainer(render_frame); |
| 1593 else | 1594 } else { |
| 1594 return new extensions::MimeHandlerViewContainer(render_frame, mime_type); | 1595 return new extensions::MimeHandlerViewContainer( |
| 1596 render_frame, mime_type, original_url); |
| 1597 } |
| 1595 #else | 1598 #else |
| 1596 return NULL; | 1599 return NULL; |
| 1597 #endif | 1600 #endif |
| 1598 } | 1601 } |
| OLD | NEW |