OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/external_tab_container_win.h" | 5 #include "chrome/browser/external_tab_container_win.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
10 #include "base/i18n/rtl.h" | 10 #include "base/i18n/rtl.h" |
(...skipping 746 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
757 const std::string& protocol, | 757 const std::string& protocol, |
758 const GURL& url, | 758 const GURL& url, |
759 const string16& title) { | 759 const string16& title) { |
760 Browser::RegisterProtocolHandlerHelper(tab, protocol, url, title); | 760 Browser::RegisterProtocolHandlerHelper(tab, protocol, url, title); |
761 } | 761 } |
762 | 762 |
763 void ExternalTabContainer::RegisterIntentHandler(TabContents* tab, | 763 void ExternalTabContainer::RegisterIntentHandler(TabContents* tab, |
764 const string16& action, | 764 const string16& action, |
765 const string16& type, | 765 const string16& type, |
766 const string16& href, | 766 const string16& href, |
767 const string16& title) { | 767 const string16& title, |
768 Browser::RegisterIntentHandlerHelper(tab, action, type, href, title); | 768 const string16& disposition) { |
| 769 Browser::RegisterIntentHandlerHelper( |
| 770 tab, action, type, href, title, disposition); |
769 } | 771 } |
770 | 772 |
771 void ExternalTabContainer::WebIntentDispatch( | 773 void ExternalTabContainer::WebIntentDispatch( |
772 TabContents* tab, | 774 TabContents* tab, |
773 int routing_id, | 775 int routing_id, |
774 const webkit_glue::WebIntentData& intent, | 776 const webkit_glue::WebIntentData& intent, |
775 int intent_id) { | 777 int intent_id) { |
776 // TODO(binji) How do we want to display the WebIntentPicker bubble if there | 778 // TODO(binji) How do we want to display the WebIntentPicker bubble if there |
777 // is no BrowserWindow? | 779 // is no BrowserWindow? |
778 } | 780 } |
(...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1214 if (params.disposition == CURRENT_TAB) { | 1216 if (params.disposition == CURRENT_TAB) { |
1215 DCHECK(route_all_top_level_navigations_); | 1217 DCHECK(route_all_top_level_navigations_); |
1216 forward_params.disposition = NEW_FOREGROUND_TAB; | 1218 forward_params.disposition = NEW_FOREGROUND_TAB; |
1217 } | 1219 } |
1218 TabContents* new_contents = | 1220 TabContents* new_contents = |
1219 ExternalTabContainer::OpenURLFromTab(source, forward_params); | 1221 ExternalTabContainer::OpenURLFromTab(source, forward_params); |
1220 // support only one navigation for a dummy tab before it is killed. | 1222 // support only one navigation for a dummy tab before it is killed. |
1221 ::DestroyWindow(GetNativeView()); | 1223 ::DestroyWindow(GetNativeView()); |
1222 return new_contents; | 1224 return new_contents; |
1223 } | 1225 } |
OLD | NEW |