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/external_tab/external_tab_container_win.h" | 5 #include "chrome/browser/external_tab/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 763 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
774 IPC_MESSAGE_UNHANDLED(handled = false) | 774 IPC_MESSAGE_UNHANDLED(handled = false) |
775 IPC_END_MESSAGE_MAP() | 775 IPC_END_MESSAGE_MAP() |
776 return handled; | 776 return handled; |
777 } | 777 } |
778 | 778 |
779 void ExternalTabContainer::DidFailProvisionalLoad( | 779 void ExternalTabContainer::DidFailProvisionalLoad( |
780 int64 frame_id, | 780 int64 frame_id, |
781 bool is_main_frame, | 781 bool is_main_frame, |
782 const GURL& validated_url, | 782 const GURL& validated_url, |
783 int error_code, | 783 int error_code, |
784 const string16& error_description) { | 784 const string16& error_description, |
| 785 content::RenderViewHost* render_view_host) { |
785 automation_->Send(new AutomationMsg_NavigationFailed( | 786 automation_->Send(new AutomationMsg_NavigationFailed( |
786 tab_handle_, error_code, validated_url)); | 787 tab_handle_, error_code, validated_url)); |
787 ignore_next_load_notification_ = true; | 788 ignore_next_load_notification_ = true; |
788 } | 789 } |
789 | 790 |
790 void ExternalTabContainer::OnForwardMessageToExternalHost( | 791 void ExternalTabContainer::OnForwardMessageToExternalHost( |
791 const std::string& message, | 792 const std::string& message, |
792 const std::string& origin, | 793 const std::string& origin, |
793 const std::string& target) { | 794 const std::string& target) { |
794 if (automation_) { | 795 if (automation_) { |
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1202 if (params.disposition == CURRENT_TAB) { | 1203 if (params.disposition == CURRENT_TAB) { |
1203 DCHECK(route_all_top_level_navigations_); | 1204 DCHECK(route_all_top_level_navigations_); |
1204 forward_params.disposition = NEW_FOREGROUND_TAB; | 1205 forward_params.disposition = NEW_FOREGROUND_TAB; |
1205 } | 1206 } |
1206 WebContents* new_contents = | 1207 WebContents* new_contents = |
1207 ExternalTabContainer::OpenURLFromTab(source, forward_params); | 1208 ExternalTabContainer::OpenURLFromTab(source, forward_params); |
1208 // support only one navigation for a dummy tab before it is killed. | 1209 // support only one navigation for a dummy tab before it is killed. |
1209 ::DestroyWindow(GetNativeView()); | 1210 ::DestroyWindow(GetNativeView()); |
1210 return new_contents; | 1211 return new_contents; |
1211 } | 1212 } |
OLD | NEW |