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 914 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
925 void ExternalTabContainer::InfoBarContainerStateChanged(bool is_animating) { | 925 void ExternalTabContainer::InfoBarContainerStateChanged(bool is_animating) { |
926 if (external_tab_view_) | 926 if (external_tab_view_) |
927 external_tab_view_->Layout(); | 927 external_tab_view_->Layout(); |
928 } | 928 } |
929 | 929 |
930 bool ExternalTabContainer::DrawInfoBarArrows(int* x) const { | 930 bool ExternalTabContainer::DrawInfoBarArrows(int* x) const { |
931 return false; | 931 return false; |
932 } | 932 } |
933 | 933 |
934 // ExternalTabContainer instances do not have a window. | 934 // ExternalTabContainer instances do not have a window. |
935 views::Window* ExternalTabContainer::GetWindow() { | 935 views::Window* ExternalTabContainer::GetContainingWindow() { |
| 936 return NULL; |
| 937 } |
| 938 |
| 939 const views::Window* ExternalTabContainer::GetContainingWindow() const { |
936 return NULL; | 940 return NULL; |
937 } | 941 } |
938 | 942 |
939 bool ExternalTabContainer::AcceleratorPressed( | 943 bool ExternalTabContainer::AcceleratorPressed( |
940 const views::Accelerator& accelerator) { | 944 const views::Accelerator& accelerator) { |
941 std::map<views::Accelerator, int>::const_iterator iter = | 945 std::map<views::Accelerator, int>::const_iterator iter = |
942 accelerator_table_.find(accelerator); | 946 accelerator_table_.find(accelerator); |
943 DCHECK(iter != accelerator_table_.end()); | 947 DCHECK(iter != accelerator_table_.end()); |
944 | 948 |
945 if (!tab_contents_.get() || !tab_contents_->render_view_host()) { | 949 if (!tab_contents_.get() || !tab_contents_->render_view_host()) { |
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1117 | 1121 |
1118 if (disposition == CURRENT_TAB) { | 1122 if (disposition == CURRENT_TAB) { |
1119 DCHECK(route_all_top_level_navigations_); | 1123 DCHECK(route_all_top_level_navigations_); |
1120 disposition = NEW_FOREGROUND_TAB; | 1124 disposition = NEW_FOREGROUND_TAB; |
1121 } | 1125 } |
1122 ExternalTabContainer::OpenURLFromTab(source, url, referrer, disposition, | 1126 ExternalTabContainer::OpenURLFromTab(source, url, referrer, disposition, |
1123 transition); | 1127 transition); |
1124 // support only one navigation for a dummy tab before it is killed. | 1128 // support only one navigation for a dummy tab before it is killed. |
1125 ::DestroyWindow(GetNativeView()); | 1129 ::DestroyWindow(GetNativeView()); |
1126 } | 1130 } |
OLD | NEW |