| 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 518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 529 const gfx::Rect& pos) { | 529 const gfx::Rect& pos) { |
| 530 if (automation_ && is_popup_window_) | 530 if (automation_ && is_popup_window_) |
| 531 automation_->Send(new AutomationMsg_MoveWindow(tab_handle_, pos)); | 531 automation_->Send(new AutomationMsg_MoveWindow(tab_handle_, pos)); |
| 532 } | 532 } |
| 533 | 533 |
| 534 TabContentsWrapper* ExternalTabContainer::GetConstrainingContentsWrapper( | 534 TabContentsWrapper* ExternalTabContainer::GetConstrainingContentsWrapper( |
| 535 TabContentsWrapper* source) { | 535 TabContentsWrapper* source) { |
| 536 return source; | 536 return source; |
| 537 } | 537 } |
| 538 | 538 |
| 539 bool ExternalTabContainer::IsPopup(const TabContents* source) const { | 539 bool ExternalTabContainer::IsPopupOrPanel(const TabContents* source) const { |
| 540 return is_popup_window_; | 540 return is_popup_window_; |
| 541 } | 541 } |
| 542 | 542 |
| 543 void ExternalTabContainer::UpdateTargetURL(TabContents* source, | 543 void ExternalTabContainer::UpdateTargetURL(TabContents* source, |
| 544 int32 page_id, | 544 int32 page_id, |
| 545 const GURL& url) { | 545 const GURL& url) { |
| 546 Browser::UpdateTargetURLHelper(source, page_id, url); | 546 Browser::UpdateTargetURLHelper(source, page_id, url); |
| 547 if (automation_) { | 547 if (automation_) { |
| 548 std::wstring url_string = CA2W(url.spec().c_str()); | 548 std::wstring url_string = CA2W(url.spec().c_str()); |
| 549 automation_->Send( | 549 automation_->Send( |
| (...skipping 676 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1226 if (params.disposition == CURRENT_TAB) { | 1226 if (params.disposition == CURRENT_TAB) { |
| 1227 DCHECK(route_all_top_level_navigations_); | 1227 DCHECK(route_all_top_level_navigations_); |
| 1228 forward_params.disposition = NEW_FOREGROUND_TAB; | 1228 forward_params.disposition = NEW_FOREGROUND_TAB; |
| 1229 } | 1229 } |
| 1230 TabContents* new_contents = | 1230 TabContents* new_contents = |
| 1231 ExternalTabContainer::OpenURLFromTab(source, forward_params); | 1231 ExternalTabContainer::OpenURLFromTab(source, forward_params); |
| 1232 // support only one navigation for a dummy tab before it is killed. | 1232 // support only one navigation for a dummy tab before it is killed. |
| 1233 ::DestroyWindow(GetNativeView()); | 1233 ::DestroyWindow(GetNativeView()); |
| 1234 return new_contents; | 1234 return new_contents; |
| 1235 } | 1235 } |
| OLD | NEW |