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/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 801 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
812 int number_of_matches, | 812 int number_of_matches, |
813 const gfx::Rect& selection_rect, | 813 const gfx::Rect& selection_rect, |
814 int active_match_ordinal, | 814 int active_match_ordinal, |
815 bool final_update) { | 815 bool final_update) { |
816 Browser::FindReplyHelper(tab, request_id, number_of_matches, selection_rect, | 816 Browser::FindReplyHelper(tab, request_id, number_of_matches, selection_rect, |
817 active_match_ordinal, final_update); | 817 active_match_ordinal, final_update); |
818 } | 818 } |
819 | 819 |
820 void ExternalTabContainerWin::RequestMediaAccessPermission( | 820 void ExternalTabContainerWin::RequestMediaAccessPermission( |
821 content::WebContents* web_contents, | 821 content::WebContents* web_contents, |
822 const content::MediaStreamRequest* request, | 822 const content::MediaStreamRequest& request, |
823 const content::MediaResponseCallback& callback) { | 823 const content::MediaResponseCallback& callback) { |
824 Browser::RequestMediaAccessPermissionHelper(web_contents, request, callback); | 824 Browser::RequestMediaAccessPermissionHelper(web_contents, request, callback); |
825 } | 825 } |
826 | 826 |
827 bool ExternalTabContainerWin::RequestPpapiBrokerPermission( | 827 bool ExternalTabContainerWin::RequestPpapiBrokerPermission( |
828 WebContents* web_contents, | 828 WebContents* web_contents, |
829 const GURL& url, | 829 const GURL& url, |
830 const FilePath& plugin_path, | 830 const FilePath& plugin_path, |
831 const base::Callback<void(bool)>& callback) { | 831 const base::Callback<void(bool)>& callback) { |
832 PepperBrokerInfoBarDelegate::Show(web_contents, url, plugin_path, callback); | 832 PepperBrokerInfoBarDelegate::Show(web_contents, url, plugin_path, callback); |
(...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1275 if (params.disposition == CURRENT_TAB) { | 1275 if (params.disposition == CURRENT_TAB) { |
1276 DCHECK(route_all_top_level_navigations_); | 1276 DCHECK(route_all_top_level_navigations_); |
1277 forward_params.disposition = NEW_FOREGROUND_TAB; | 1277 forward_params.disposition = NEW_FOREGROUND_TAB; |
1278 } | 1278 } |
1279 WebContents* new_contents = | 1279 WebContents* new_contents = |
1280 ExternalTabContainerWin::OpenURLFromTab(source, forward_params); | 1280 ExternalTabContainerWin::OpenURLFromTab(source, forward_params); |
1281 // support only one navigation for a dummy tab before it is killed. | 1281 // support only one navigation for a dummy tab before it is killed. |
1282 ::DestroyWindow(GetNativeView()); | 1282 ::DestroyWindow(GetNativeView()); |
1283 return new_contents; | 1283 return new_contents; |
1284 } | 1284 } |
OLD | NEW |