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 748 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
759 const std::string& protocol, | 759 const std::string& protocol, |
760 const GURL& url, | 760 const GURL& url, |
761 const string16& title) { | 761 const string16& title) { |
762 Browser::RegisterProtocolHandlerHelper(tab, protocol, url, title); | 762 Browser::RegisterProtocolHandlerHelper(tab, protocol, url, title); |
763 } | 763 } |
764 | 764 |
765 void ExternalTabContainer::RegisterIntentHandler(TabContents* tab, | 765 void ExternalTabContainer::RegisterIntentHandler(TabContents* tab, |
766 const string16& action, | 766 const string16& action, |
767 const string16& type, | 767 const string16& type, |
768 const string16& href, | 768 const string16& href, |
769 const string16& title) { | 769 const string16& title, |
770 Browser::RegisterIntentHandlerHelper(tab, action, type, href, title); | 770 const string16& disposition) { |
| 771 Browser::RegisterIntentHandlerHelper( |
| 772 tab, action, type, href, title, disposition); |
771 } | 773 } |
772 | 774 |
773 void ExternalTabContainer::WebIntentDispatch( | 775 void ExternalTabContainer::WebIntentDispatch( |
774 TabContents* tab, | 776 TabContents* tab, |
775 int routing_id, | 777 int routing_id, |
776 const webkit_glue::WebIntentData& intent, | 778 const webkit_glue::WebIntentData& intent, |
777 int intent_id) { | 779 int intent_id) { |
778 // TODO(binji) How do we want to display the WebIntentPicker bubble if there | 780 // TODO(binji) How do we want to display the WebIntentPicker bubble if there |
779 // is no BrowserWindow? | 781 // is no BrowserWindow? |
780 } | 782 } |
(...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1223 if (params.disposition == CURRENT_TAB) { | 1225 if (params.disposition == CURRENT_TAB) { |
1224 DCHECK(route_all_top_level_navigations_); | 1226 DCHECK(route_all_top_level_navigations_); |
1225 forward_params.disposition = NEW_FOREGROUND_TAB; | 1227 forward_params.disposition = NEW_FOREGROUND_TAB; |
1226 } | 1228 } |
1227 TabContents* new_contents = | 1229 TabContents* new_contents = |
1228 ExternalTabContainer::OpenURLFromTab(source, forward_params); | 1230 ExternalTabContainer::OpenURLFromTab(source, forward_params); |
1229 // support only one navigation for a dummy tab before it is killed. | 1231 // support only one navigation for a dummy tab before it is killed. |
1230 ::DestroyWindow(GetNativeView()); | 1232 ::DestroyWindow(GetNativeView()); |
1231 return new_contents; | 1233 return new_contents; |
1232 } | 1234 } |
OLD | NEW |