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

Side by Side Diff: chrome/browser/ui/views/external_tab_container_win.cc

Issue 10692113: Wire up GetUserMedia in Chrome Frame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: moved media thread changes to issue 10744002 Created 8 years, 5 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
« no previous file with comments | « chrome/browser/ui/views/external_tab_container_win.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/ui/views/external_tab_container_win.h" 5 #include "chrome/browser/ui/views/external_tab_container_win.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 795 matching lines...) Expand 10 before | Expand all | Expand 10 after
806 void ExternalTabContainerWin::FindReply(WebContents* tab, 806 void ExternalTabContainerWin::FindReply(WebContents* tab,
807 int request_id, 807 int request_id,
808 int number_of_matches, 808 int number_of_matches,
809 const gfx::Rect& selection_rect, 809 const gfx::Rect& selection_rect,
810 int active_match_ordinal, 810 int active_match_ordinal,
811 bool final_update) { 811 bool final_update) {
812 Browser::FindReplyHelper(tab, request_id, number_of_matches, selection_rect, 812 Browser::FindReplyHelper(tab, request_id, number_of_matches, selection_rect,
813 active_match_ordinal, final_update); 813 active_match_ordinal, final_update);
814 } 814 }
815 815
816 void ExternalTabContainerWin::RequestMediaAccessPermission(
817 content::WebContents* web_contents,
818 const content::MediaStreamRequest* request,
819 const content::MediaResponseCallback& callback) {
820 Browser::RequestMediaAccessPermissionHelper(web_contents, request, callback);
821 }
822
816 bool ExternalTabContainerWin::OnMessageReceived(const IPC::Message& message) { 823 bool ExternalTabContainerWin::OnMessageReceived(const IPC::Message& message) {
817 bool handled = true; 824 bool handled = true;
818 IPC_BEGIN_MESSAGE_MAP(ExternalTabContainerWin, message) 825 IPC_BEGIN_MESSAGE_MAP(ExternalTabContainerWin, message)
819 IPC_MESSAGE_HANDLER(ChromeViewHostMsg_ForwardMessageToExternalHost, 826 IPC_MESSAGE_HANDLER(ChromeViewHostMsg_ForwardMessageToExternalHost,
820 OnForwardMessageToExternalHost) 827 OnForwardMessageToExternalHost)
821 IPC_MESSAGE_UNHANDLED(handled = false) 828 IPC_MESSAGE_UNHANDLED(handled = false)
822 IPC_END_MESSAGE_MAP() 829 IPC_END_MESSAGE_MAP()
823 return handled; 830 return handled;
824 } 831 }
825 832
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after
1240 if (params.disposition == CURRENT_TAB) { 1247 if (params.disposition == CURRENT_TAB) {
1241 DCHECK(route_all_top_level_navigations_); 1248 DCHECK(route_all_top_level_navigations_);
1242 forward_params.disposition = NEW_FOREGROUND_TAB; 1249 forward_params.disposition = NEW_FOREGROUND_TAB;
1243 } 1250 }
1244 WebContents* new_contents = 1251 WebContents* new_contents =
1245 ExternalTabContainerWin::OpenURLFromTab(source, forward_params); 1252 ExternalTabContainerWin::OpenURLFromTab(source, forward_params);
1246 // support only one navigation for a dummy tab before it is killed. 1253 // support only one navigation for a dummy tab before it is killed.
1247 ::DestroyWindow(GetNativeView()); 1254 ::DestroyWindow(GetNativeView());
1248 return new_contents; 1255 return new_contents;
1249 } 1256 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/external_tab_container_win.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698