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 22 matching lines...) Expand all Loading... |
33 #include "chrome/common/automation_messages.h" | 33 #include "chrome/common/automation_messages.h" |
34 #include "chrome/common/chrome_constants.h" | 34 #include "chrome/common/chrome_constants.h" |
35 #include "chrome/common/chrome_notification_types.h" | 35 #include "chrome/common/chrome_notification_types.h" |
36 #include "chrome/common/render_messages.h" | 36 #include "chrome/common/render_messages.h" |
37 #include "chrome/common/url_constants.h" | 37 #include "chrome/common/url_constants.h" |
38 #include "content/browser/load_notification_details.h" | 38 #include "content/browser/load_notification_details.h" |
39 #include "content/browser/renderer_host/render_view_host.h" | 39 #include "content/browser/renderer_host/render_view_host.h" |
40 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" | 40 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" |
41 #include "content/browser/tab_contents/navigation_details.h" | 41 #include "content/browser/tab_contents/navigation_details.h" |
42 #include "content/browser/tab_contents/provisional_load_details.h" | 42 #include "content/browser/tab_contents/provisional_load_details.h" |
43 #include "content/common/view_messages.h" | |
44 #include "content/public/browser/native_web_keyboard_event.h" | 43 #include "content/public/browser/native_web_keyboard_event.h" |
45 #include "content/public/browser/notification_service.h" | 44 #include "content/public/browser/notification_service.h" |
46 #include "content/public/common/bindings_policy.h" | 45 #include "content/public/common/bindings_policy.h" |
| 46 #include "content/public/common/frame_navigate_params.h" |
47 #include "content/public/common/page_transition_types.h" | 47 #include "content/public/common/page_transition_types.h" |
48 #include "content/public/common/page_zoom.h" | 48 #include "content/public/common/page_zoom.h" |
49 #include "grit/generated_resources.h" | 49 #include "grit/generated_resources.h" |
50 #include "grit/locale_settings.h" | 50 #include "grit/locale_settings.h" |
51 #include "ui/base/l10n/l10n_util.h" | 51 #include "ui/base/l10n/l10n_util.h" |
52 #include "ui/base/models/menu_model.h" | 52 #include "ui/base/models/menu_model.h" |
53 #include "ui/base/resource/resource_bundle.h" | 53 #include "ui/base/resource/resource_bundle.h" |
54 #include "ui/base/view_prop.h" | 54 #include "ui/base/view_prop.h" |
55 #include "ui/views/layout/grid_layout.h" | 55 #include "ui/views/layout/grid_layout.h" |
56 | 56 |
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
358 case SAVE_TO_DISK: | 358 case SAVE_TO_DISK: |
359 if (automation_) { | 359 if (automation_) { |
360 automation_->Send(new AutomationMsg_OpenURL(tab_handle_, | 360 automation_->Send(new AutomationMsg_OpenURL(tab_handle_, |
361 params.url, | 361 params.url, |
362 params.referrer, | 362 params.referrer, |
363 params.disposition)); | 363 params.disposition)); |
364 // TODO(ananta) | 364 // TODO(ananta) |
365 // We should populate other fields in the | 365 // We should populate other fields in the |
366 // ViewHostMsg_FrameNavigate_Params structure. Another option could be | 366 // ViewHostMsg_FrameNavigate_Params structure. Another option could be |
367 // to refactor the UpdateHistoryForNavigation function in TabContents. | 367 // to refactor the UpdateHistoryForNavigation function in TabContents. |
368 ViewHostMsg_FrameNavigate_Params nav_params; | 368 content::FrameNavigateParams nav_params; |
369 nav_params.referrer = params.referrer; | 369 nav_params.referrer = params.referrer; |
370 nav_params.url = params.url; | 370 nav_params.url = params.url; |
371 nav_params.page_id = -1; | 371 nav_params.page_id = -1; |
372 nav_params.transition = content::PAGE_TRANSITION_LINK; | 372 nav_params.transition = content::PAGE_TRANSITION_LINK; |
373 | 373 |
374 content::LoadCommittedDetails details; | 374 content::LoadCommittedDetails details; |
375 details.did_replace_entry = false; | 375 details.did_replace_entry = false; |
376 | 376 |
377 scoped_refptr<history::HistoryAddPageArgs> add_page_args( | 377 scoped_refptr<history::HistoryAddPageArgs> add_page_args( |
378 tab_contents_->history_tab_helper()-> | 378 tab_contents_->history_tab_helper()-> |
(...skipping 796 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1175 if (params.disposition == CURRENT_TAB) { | 1175 if (params.disposition == CURRENT_TAB) { |
1176 DCHECK(route_all_top_level_navigations_); | 1176 DCHECK(route_all_top_level_navigations_); |
1177 forward_params.disposition = NEW_FOREGROUND_TAB; | 1177 forward_params.disposition = NEW_FOREGROUND_TAB; |
1178 } | 1178 } |
1179 TabContents* new_contents = | 1179 TabContents* new_contents = |
1180 ExternalTabContainer::OpenURLFromTab(source, forward_params); | 1180 ExternalTabContainer::OpenURLFromTab(source, forward_params); |
1181 // support only one navigation for a dummy tab before it is killed. | 1181 // support only one navigation for a dummy tab before it is killed. |
1182 ::DestroyWindow(GetNativeView()); | 1182 ::DestroyWindow(GetNativeView()); |
1183 return new_contents; | 1183 return new_contents; |
1184 } | 1184 } |
OLD | NEW |