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

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

Issue 263513004: Forward MIME types to BrowserPlugin when a viewer is specified. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Send URLRequest instead of extra params Created 6 years, 6 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 822 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 GuestViewBases won't 838 /// TODO(fsamuel): In the future, certain types of GuestViewBases won't
839 // require extension bindings. At that point, we should clear |extension_id| 839 // require extension bindings. At that point, we should clear |extension_id|
840 // instead of exiting early. 840 // instead of exiting early.
841 if (!extension_id.empty() && 841 if (!extension_id.empty() &&
842 !service->GetExtensionById(extension_id, false)) { 842 !service->GetExtensionById(extension_id, false)) {
843 NOTREACHED(); 843 *guest_delegate =
844 GuestViewBase::Create(guest_instance_id,
845 guest_web_contents,
846 extension_id,
847 "webview");
844 return; 848 return;
845 } 849 }
846 850
847 if (opener_web_contents) { 851 if (opener_web_contents) {
848 GuestViewBase* guest = GuestViewBase::FromWebContents(opener_web_contents); 852 GuestViewBase* guest = GuestViewBase::FromWebContents(opener_web_contents);
849 if (!guest) { 853 if (!guest) {
850 NOTREACHED(); 854 NOTREACHED();
851 return; 855 return;
852 } 856 }
853 857
(...skipping 1903 matching lines...) Expand 10 before | Expand all | Expand 10 after
2757 switches::kDisableWebRtcEncryption, 2761 switches::kDisableWebRtcEncryption,
2758 }; 2762 };
2759 to_command_line->CopySwitchesFrom(from_command_line, 2763 to_command_line->CopySwitchesFrom(from_command_line,
2760 kWebRtcDevSwitchNames, 2764 kWebRtcDevSwitchNames,
2761 arraysize(kWebRtcDevSwitchNames)); 2765 arraysize(kWebRtcDevSwitchNames));
2762 } 2766 }
2763 } 2767 }
2764 #endif // defined(ENABLE_WEBRTC) 2768 #endif // defined(ENABLE_WEBRTC)
2765 2769
2766 } // namespace chrome 2770 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698