| 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 "app/l10n_util.h" | 9 #include "app/l10n_util.h" |
| 10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
| (...skipping 903 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 914 } | 914 } |
| 915 | 915 |
| 916 AutomationExtensionFunction::Enable(tab_contents_, functions_enabled); | 916 AutomationExtensionFunction::Enable(tab_contents_, functions_enabled); |
| 917 enabled_extension_automation_ = true; | 917 enabled_extension_automation_ = true; |
| 918 } else { | 918 } else { |
| 919 AutomationExtensionFunction::Disable(); | 919 AutomationExtensionFunction::Disable(); |
| 920 enabled_extension_automation_ = false; | 920 enabled_extension_automation_ = false; |
| 921 } | 921 } |
| 922 } | 922 } |
| 923 | 923 |
| 924 void ExternalTabContainer::InfoBarSizeChanged(bool is_animating) { | 924 void ExternalTabContainer::InfoBarContainerSizeChanged(bool is_animating) { |
| 925 if (external_tab_view_) { | 925 if (external_tab_view_) |
| 926 external_tab_view_->Layout(); | 926 external_tab_view_->Layout(); |
| 927 } | |
| 928 } | 927 } |
| 929 | 928 |
| 930 // ExternalTabContainer instances do not have a window. | 929 // ExternalTabContainer instances do not have a window. |
| 931 views::Window* ExternalTabContainer::GetWindow() { | 930 views::Window* ExternalTabContainer::GetWindow() { |
| 932 return NULL; | 931 return NULL; |
| 933 } | 932 } |
| 934 | 933 |
| 935 bool ExternalTabContainer::AcceleratorPressed( | 934 bool ExternalTabContainer::AcceleratorPressed( |
| 936 const views::Accelerator& accelerator) { | 935 const views::Accelerator& accelerator) { |
| 937 std::map<views::Accelerator, int>::const_iterator iter = | 936 std::map<views::Accelerator, int>::const_iterator iter = |
| (...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1113 | 1112 |
| 1114 if (disposition == CURRENT_TAB) { | 1113 if (disposition == CURRENT_TAB) { |
| 1115 DCHECK(route_all_top_level_navigations_); | 1114 DCHECK(route_all_top_level_navigations_); |
| 1116 disposition = NEW_FOREGROUND_TAB; | 1115 disposition = NEW_FOREGROUND_TAB; |
| 1117 } | 1116 } |
| 1118 ExternalTabContainer::OpenURLFromTab(source, url, referrer, disposition, | 1117 ExternalTabContainer::OpenURLFromTab(source, url, referrer, disposition, |
| 1119 transition); | 1118 transition); |
| 1120 // support only one navigation for a dummy tab before it is killed. | 1119 // support only one navigation for a dummy tab before it is killed. |
| 1121 ::DestroyWindow(GetNativeView()); | 1120 ::DestroyWindow(GetNativeView()); |
| 1122 } | 1121 } |
| OLD | NEW |