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_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/bind.h" | 9 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
(...skipping 777 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
788 const std::string& target) { | 788 const std::string& target) { |
789 if (automation_) { | 789 if (automation_) { |
790 automation_->Send(new AutomationMsg_ForwardMessageToExternalHost( | 790 automation_->Send(new AutomationMsg_ForwardMessageToExternalHost( |
791 tab_handle_, message, origin, target)); | 791 tab_handle_, message, origin, target)); |
792 } | 792 } |
793 } | 793 } |
794 | 794 |
795 //////////////////////////////////////////////////////////////////////////////// | 795 //////////////////////////////////////////////////////////////////////////////// |
796 // ExternalTabContainer, NotificationObserver implementation: | 796 // ExternalTabContainer, NotificationObserver implementation: |
797 | 797 |
798 void ExternalTabContainer::Observe(int type, | 798 void ExternalTabContainer::Observe( |
799 const content::NotificationSource& source, | 799 int type, |
800 const content::NotificationDetails& details)
{ | 800 const content::NotificationSource& source, |
| 801 const content::NotificationDetails& details) { |
801 if (!automation_) | 802 if (!automation_) |
802 return; | 803 return; |
803 | 804 |
804 static const int kHttpClientErrorStart = 400; | 805 static const int kHttpClientErrorStart = 400; |
805 static const int kHttpServerErrorEnd = 510; | 806 static const int kHttpServerErrorEnd = 510; |
806 | 807 |
807 switch (type) { | 808 switch (type) { |
808 case content::NOTIFICATION_LOAD_STOP: { | 809 case content::NOTIFICATION_LOAD_STOP: { |
809 const LoadNotificationDetails* load = | 810 const LoadNotificationDetails* load = |
810 content::Details<LoadNotificationDetails>(details).ptr(); | 811 content::Details<LoadNotificationDetails>(details).ptr(); |
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1111 for (int i = 0; i < count; ++i) { | 1112 for (int i = 0; i < count; ++i) { |
1112 bool alt_down = (accelerators[i].fVirt & FALT) == FALT; | 1113 bool alt_down = (accelerators[i].fVirt & FALT) == FALT; |
1113 bool ctrl_down = (accelerators[i].fVirt & FCONTROL) == FCONTROL; | 1114 bool ctrl_down = (accelerators[i].fVirt & FCONTROL) == FCONTROL; |
1114 bool shift_down = (accelerators[i].fVirt & FSHIFT) == FSHIFT; | 1115 bool shift_down = (accelerators[i].fVirt & FSHIFT) == FSHIFT; |
1115 ui::Accelerator accelerator( | 1116 ui::Accelerator accelerator( |
1116 static_cast<ui::KeyboardCode>(accelerators[i].key), | 1117 static_cast<ui::KeyboardCode>(accelerators[i].key), |
1117 shift_down, ctrl_down, alt_down); | 1118 shift_down, ctrl_down, alt_down); |
1118 accelerator_table_[accelerator] = accelerators[i].cmd; | 1119 accelerator_table_[accelerator] = accelerators[i].cmd; |
1119 | 1120 |
1120 // Also register with the focus manager. | 1121 // Also register with the focus manager. |
1121 if (focus_manager_) | 1122 if (focus_manager_) { |
1122 focus_manager_->RegisterAccelerator(accelerator, this); | 1123 focus_manager_->RegisterAccelerator( |
| 1124 accelerator, ui::AcceleratorManager::kNormalPriority, this); |
| 1125 } |
1123 } | 1126 } |
1124 } | 1127 } |
1125 | 1128 |
1126 void ExternalTabContainer::OnReinitialize() { | 1129 void ExternalTabContainer::OnReinitialize() { |
1127 if (load_requests_via_automation_) { | 1130 if (load_requests_via_automation_) { |
1128 RenderViewHost* rvh = tab_contents_->web_contents()->GetRenderViewHost(); | 1131 RenderViewHost* rvh = tab_contents_->web_contents()->GetRenderViewHost(); |
1129 if (rvh) { | 1132 if (rvh) { |
1130 AutomationResourceMessageFilter::ResumePendingRenderView( | 1133 AutomationResourceMessageFilter::ResumePendingRenderView( |
1131 rvh->process()->GetID(), rvh->routing_id(), | 1134 rvh->process()->GetID(), rvh->routing_id(), |
1132 tab_handle_, automation_resource_message_filter_); | 1135 tab_handle_, automation_resource_message_filter_); |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1203 if (params.disposition == CURRENT_TAB) { | 1206 if (params.disposition == CURRENT_TAB) { |
1204 DCHECK(route_all_top_level_navigations_); | 1207 DCHECK(route_all_top_level_navigations_); |
1205 forward_params.disposition = NEW_FOREGROUND_TAB; | 1208 forward_params.disposition = NEW_FOREGROUND_TAB; |
1206 } | 1209 } |
1207 WebContents* new_contents = | 1210 WebContents* new_contents = |
1208 ExternalTabContainer::OpenURLFromTab(source, forward_params); | 1211 ExternalTabContainer::OpenURLFromTab(source, forward_params); |
1209 // support only one navigation for a dummy tab before it is killed. | 1212 // support only one navigation for a dummy tab before it is killed. |
1210 ::DestroyWindow(GetNativeView()); | 1213 ::DestroyWindow(GetNativeView()); |
1211 return new_contents; | 1214 return new_contents; |
1212 } | 1215 } |
OLD | NEW |