| 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 503 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 514 automation_->Send(new AutomationMsg_CloseExternalTab(tab_handle_)); | 514 automation_->Send(new AutomationMsg_CloseExternalTab(tab_handle_)); |
| 515 } | 515 } |
| 516 } | 516 } |
| 517 | 517 |
| 518 void ExternalTabContainer::MoveContents(WebContents* source, | 518 void ExternalTabContainer::MoveContents(WebContents* source, |
| 519 const gfx::Rect& pos) { | 519 const gfx::Rect& pos) { |
| 520 if (automation_ && is_popup_window_) | 520 if (automation_ && is_popup_window_) |
| 521 automation_->Send(new AutomationMsg_MoveWindow(tab_handle_, pos)); | 521 automation_->Send(new AutomationMsg_MoveWindow(tab_handle_, pos)); |
| 522 } | 522 } |
| 523 | 523 |
| 524 TabContents* ExternalTabContainer::GetConstrainingContentsWrapper( | 524 TabContents* ExternalTabContainer::GetConstrainingTabContents( |
| 525 TabContents* source) { | 525 TabContents* source) { |
| 526 return source; | 526 return source; |
| 527 } | 527 } |
| 528 | 528 |
| 529 bool ExternalTabContainer::IsPopupOrPanel(const WebContents* source) const { | 529 bool ExternalTabContainer::IsPopupOrPanel(const WebContents* source) const { |
| 530 return is_popup_window_; | 530 return is_popup_window_; |
| 531 } | 531 } |
| 532 | 532 |
| 533 void ExternalTabContainer::UpdateTargetURL(WebContents* source, | 533 void ExternalTabContainer::UpdateTargetURL(WebContents* source, |
| 534 int32 page_id, | 534 int32 page_id, |
| (...skipping 667 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1202 if (params.disposition == CURRENT_TAB) { | 1202 if (params.disposition == CURRENT_TAB) { |
| 1203 DCHECK(route_all_top_level_navigations_); | 1203 DCHECK(route_all_top_level_navigations_); |
| 1204 forward_params.disposition = NEW_FOREGROUND_TAB; | 1204 forward_params.disposition = NEW_FOREGROUND_TAB; |
| 1205 } | 1205 } |
| 1206 WebContents* new_contents = | 1206 WebContents* new_contents = |
| 1207 ExternalTabContainer::OpenURLFromTab(source, forward_params); | 1207 ExternalTabContainer::OpenURLFromTab(source, forward_params); |
| 1208 // support only one navigation for a dummy tab before it is killed. | 1208 // support only one navigation for a dummy tab before it is killed. |
| 1209 ::DestroyWindow(GetNativeView()); | 1209 ::DestroyWindow(GetNativeView()); |
| 1210 return new_contents; | 1210 return new_contents; |
| 1211 } | 1211 } |
| OLD | NEW |