| 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/browser/chrome_content_browser_client.h" | 5 #include "chrome/browser/chrome_content_browser_client.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <utility> | 8 #include <utility> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 822 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 833 ExtensionService* service = | 833 ExtensionService* service = |
| 834 extensions::ExtensionSystem::Get(profile)->extension_service(); | 834 extensions::ExtensionSystem::Get(profile)->extension_service(); |
| 835 if (!service) { | 835 if (!service) { |
| 836 NOTREACHED(); | 836 NOTREACHED(); |
| 837 return; | 837 return; |
| 838 } | 838 } |
| 839 | 839 |
| 840 /// TODO(fsamuel): In the future, certain types of GuestViews won't require | 840 /// TODO(fsamuel): In the future, certain types of GuestViews won't require |
| 841 // extension bindings. At that point, we should clear |extension_id| instead | 841 // extension bindings. At that point, we should clear |extension_id| instead |
| 842 // of exiting early. | 842 // of exiting early. |
| 843 if (!service->GetExtensionById(extension_id, false) && | 843 if (!service->GetExtensionById(extension_id, false)) { |
| 844 !CommandLine::ForCurrentProcess()->HasSwitch( | |
| 845 switches::kEnableBrowserPluginForAllViewTypes)) { | |
| 846 NOTREACHED(); | 844 NOTREACHED(); |
| 847 return; | 845 return; |
| 848 } | 846 } |
| 849 | 847 |
| 850 if (opener_web_contents) { | 848 if (opener_web_contents) { |
| 851 GuestView* guest = GuestView::FromWebContents(opener_web_contents); | 849 GuestView* guest = GuestView::FromWebContents(opener_web_contents); |
| 852 if (!guest) { | 850 if (!guest) { |
| 853 NOTREACHED(); | 851 NOTREACHED(); |
| 854 return; | 852 return; |
| 855 } | 853 } |
| (...skipping 1812 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2668 switches::kDisableWebRtcEncryption, | 2666 switches::kDisableWebRtcEncryption, |
| 2669 }; | 2667 }; |
| 2670 to_command_line->CopySwitchesFrom(from_command_line, | 2668 to_command_line->CopySwitchesFrom(from_command_line, |
| 2671 kWebRtcDevSwitchNames, | 2669 kWebRtcDevSwitchNames, |
| 2672 arraysize(kWebRtcDevSwitchNames)); | 2670 arraysize(kWebRtcDevSwitchNames)); |
| 2673 } | 2671 } |
| 2674 } | 2672 } |
| 2675 #endif // defined(ENABLE_WEBRTC) | 2673 #endif // defined(ENABLE_WEBRTC) |
| 2676 | 2674 |
| 2677 } // namespace chrome | 2675 } // namespace chrome |
| OLD | NEW |