| 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 520 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 531 TabContentsWrapper* ExternalTabContainer::GetConstrainingContentsWrapper( | 531 TabContentsWrapper* ExternalTabContainer::GetConstrainingContentsWrapper( |
| 532 TabContentsWrapper* source) { | 532 TabContentsWrapper* source) { |
| 533 return source; | 533 return source; |
| 534 } | 534 } |
| 535 | 535 |
| 536 bool ExternalTabContainer::IsPopup(const TabContents* source) const { | 536 bool ExternalTabContainer::IsPopup(const TabContents* source) const { |
| 537 return is_popup_window_; | 537 return is_popup_window_; |
| 538 } | 538 } |
| 539 | 539 |
| 540 void ExternalTabContainer::UpdateTargetURL(TabContents* source, | 540 void ExternalTabContainer::UpdateTargetURL(TabContents* source, |
| 541 int32 page_id, |
| 541 const GURL& url) { | 542 const GURL& url) { |
| 543 Browser::UpdateTargetURLHelper(source, page_id, url); |
| 542 if (automation_) { | 544 if (automation_) { |
| 543 std::wstring url_string = CA2W(url.spec().c_str()); | 545 std::wstring url_string = CA2W(url.spec().c_str()); |
| 544 automation_->Send( | 546 automation_->Send( |
| 545 new AutomationMsg_UpdateTargetUrl(tab_handle_, url_string)); | 547 new AutomationMsg_UpdateTargetUrl(tab_handle_, url_string)); |
| 546 } | 548 } |
| 547 } | 549 } |
| 548 | 550 |
| 549 void ExternalTabContainer::ContentsZoomChange(bool zoom_in) { | 551 void ExternalTabContainer::ContentsZoomChange(bool zoom_in) { |
| 550 } | 552 } |
| 551 | 553 |
| (...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 778 void ExternalTabContainer::FindReply(TabContents* tab, | 780 void ExternalTabContainer::FindReply(TabContents* tab, |
| 779 int request_id, | 781 int request_id, |
| 780 int number_of_matches, | 782 int number_of_matches, |
| 781 const gfx::Rect& selection_rect, | 783 const gfx::Rect& selection_rect, |
| 782 int active_match_ordinal, | 784 int active_match_ordinal, |
| 783 bool final_update) { | 785 bool final_update) { |
| 784 Browser::FindReplyHelper(tab, request_id, number_of_matches, selection_rect, | 786 Browser::FindReplyHelper(tab, request_id, number_of_matches, selection_rect, |
| 785 active_match_ordinal, final_update); | 787 active_match_ordinal, final_update); |
| 786 } | 788 } |
| 787 | 789 |
| 790 void ExternalTabContainer::CrashedPlugin(TabContents* tab, |
| 791 const FilePath& plugin_path) { |
| 792 Browser::CrashedPluginHelper(tab, plugin_path); |
| 793 } |
| 794 |
| 788 bool ExternalTabContainer::OnMessageReceived(const IPC::Message& message) { | 795 bool ExternalTabContainer::OnMessageReceived(const IPC::Message& message) { |
| 789 bool handled = true; | 796 bool handled = true; |
| 790 IPC_BEGIN_MESSAGE_MAP(ExternalTabContainer, message) | 797 IPC_BEGIN_MESSAGE_MAP(ExternalTabContainer, message) |
| 791 IPC_MESSAGE_HANDLER(ChromeViewHostMsg_ForwardMessageToExternalHost, | 798 IPC_MESSAGE_HANDLER(ChromeViewHostMsg_ForwardMessageToExternalHost, |
| 792 OnForwardMessageToExternalHost) | 799 OnForwardMessageToExternalHost) |
| 793 IPC_MESSAGE_UNHANDLED(handled = false) | 800 IPC_MESSAGE_UNHANDLED(handled = false) |
| 794 IPC_END_MESSAGE_MAP() | 801 IPC_END_MESSAGE_MAP() |
| 795 return handled; | 802 return handled; |
| 796 } | 803 } |
| 797 | 804 |
| (...skipping 406 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1204 if (params.disposition == CURRENT_TAB) { | 1211 if (params.disposition == CURRENT_TAB) { |
| 1205 DCHECK(route_all_top_level_navigations_); | 1212 DCHECK(route_all_top_level_navigations_); |
| 1206 forward_params.disposition = NEW_FOREGROUND_TAB; | 1213 forward_params.disposition = NEW_FOREGROUND_TAB; |
| 1207 } | 1214 } |
| 1208 TabContents* new_contents = | 1215 TabContents* new_contents = |
| 1209 ExternalTabContainer::OpenURLFromTab(source, forward_params); | 1216 ExternalTabContainer::OpenURLFromTab(source, forward_params); |
| 1210 // support only one navigation for a dummy tab before it is killed. | 1217 // support only one navigation for a dummy tab before it is killed. |
| 1211 ::DestroyWindow(GetNativeView()); | 1218 ::DestroyWindow(GetNativeView()); |
| 1212 return new_contents; | 1219 return new_contents; |
| 1213 } | 1220 } |
| OLD | NEW |