Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 236073004: Remove kEnableBrowserPluginForAllViewTypes flag (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 820 matching lines...) Expand 10 before | Expand all | Expand 10 after
831 ExtensionService* service = 831 ExtensionService* service =
832 extensions::ExtensionSystem::Get(profile)->extension_service(); 832 extensions::ExtensionSystem::Get(profile)->extension_service();
833 if (!service) { 833 if (!service) {
834 NOTREACHED(); 834 NOTREACHED();
835 return; 835 return;
836 } 836 }
837 837
838 /// TODO(fsamuel): In the future, certain types of GuestViews won't require 838 /// TODO(fsamuel): In the future, certain types of GuestViews won't require
839 // extension bindings. At that point, we should clear |extension_id| instead 839 // extension bindings. At that point, we should clear |extension_id| instead
840 // of exiting early. 840 // of exiting early.
841 if (!service->GetExtensionById(extension_id, false) && 841 if (!service->GetExtensionById(extension_id, false)) {
842 !CommandLine::ForCurrentProcess()->HasSwitch(
843 switches::kEnableBrowserPluginForAllViewTypes)) {
844 NOTREACHED(); 842 NOTREACHED();
845 return; 843 return;
846 } 844 }
847 845
848 if (opener_web_contents) { 846 if (opener_web_contents) {
849 GuestView* guest = GuestView::FromWebContents(opener_web_contents); 847 GuestView* guest = GuestView::FromWebContents(opener_web_contents);
850 if (!guest) { 848 if (!guest) {
851 NOTREACHED(); 849 NOTREACHED();
852 return; 850 return;
853 } 851 }
(...skipping 1871 matching lines...) Expand 10 before | Expand all | Expand 10 after
2725 switches::kDisableWebRtcEncryption, 2723 switches::kDisableWebRtcEncryption,
2726 }; 2724 };
2727 to_command_line->CopySwitchesFrom(from_command_line, 2725 to_command_line->CopySwitchesFrom(from_command_line,
2728 kWebRtcDevSwitchNames, 2726 kWebRtcDevSwitchNames,
2729 arraysize(kWebRtcDevSwitchNames)); 2727 arraysize(kWebRtcDevSwitchNames));
2730 } 2728 }
2731 } 2729 }
2732 #endif // defined(ENABLE_WEBRTC) 2730 #endif // defined(ENABLE_WEBRTC)
2733 2731
2734 } // namespace chrome 2732 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/startup/bad_flags_prompt.cc » ('j') | content/shell/renderer/shell_content_renderer_client.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698