| 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 1473 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1484 // Allow access for tests. | 1484 // Allow access for tests. |
| 1485 if (CommandLine::ForCurrentProcess()->HasSwitch( | 1485 if (CommandLine::ForCurrentProcess()->HasSwitch( |
| 1486 switches::kEnablePepperTesting)) { | 1486 switches::kEnablePepperTesting)) { |
| 1487 return true; | 1487 return true; |
| 1488 } | 1488 } |
| 1489 #endif // !defined(OS_ANDROID) | 1489 #endif // !defined(OS_ANDROID) |
| 1490 return false; | 1490 return false; |
| 1491 } | 1491 } |
| 1492 | 1492 |
| 1493 void ChromeContentRendererClient::AddKeySystems( | 1493 void ChromeContentRendererClient::AddKeySystems( |
| 1494 std::vector<content::KeySystemInfo>* key_systems) { | 1494 std::vector<media::KeySystemInfo>* key_systems) { |
| 1495 AddChromeKeySystems(key_systems); | 1495 AddChromeKeySystems(key_systems); |
| 1496 } | 1496 } |
| 1497 | 1497 |
| 1498 bool ChromeContentRendererClient::ShouldReportDetailedMessageForSource( | 1498 bool ChromeContentRendererClient::ShouldReportDetailedMessageForSource( |
| 1499 const base::string16& source) const { | 1499 const base::string16& source) const { |
| 1500 return extensions::IsSourceFromAnExtension(source); | 1500 return extensions::IsSourceFromAnExtension(source); |
| 1501 } | 1501 } |
| 1502 | 1502 |
| 1503 bool ChromeContentRendererClient::ShouldEnableSiteIsolationPolicy() const { | 1503 bool ChromeContentRendererClient::ShouldEnableSiteIsolationPolicy() const { |
| 1504 // SiteIsolationPolicy is off by default. We would like to activate cross-site | 1504 // SiteIsolationPolicy is off by default. We would like to activate cross-site |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1571 content::BrowserPluginDelegate* | 1571 content::BrowserPluginDelegate* |
| 1572 ChromeContentRendererClient::CreateBrowserPluginDelegate( | 1572 ChromeContentRendererClient::CreateBrowserPluginDelegate( |
| 1573 content::RenderFrame* render_frame, | 1573 content::RenderFrame* render_frame, |
| 1574 const std::string& mime_type) { | 1574 const std::string& mime_type) { |
| 1575 #if defined(ENABLE_EXTENSIONS) | 1575 #if defined(ENABLE_EXTENSIONS) |
| 1576 return new extensions::GuestViewContainer(render_frame, mime_type); | 1576 return new extensions::GuestViewContainer(render_frame, mime_type); |
| 1577 #else | 1577 #else |
| 1578 return NULL; | 1578 return NULL; |
| 1579 #endif | 1579 #endif |
| 1580 } | 1580 } |
| OLD | NEW |