OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/i18n/rtl.h" | 9 #include "base/i18n/rtl.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 11 matching lines...) Expand all Loading... |
22 #include "chrome/browser/renderer_host/render_process_host.h" | 22 #include "chrome/browser/renderer_host/render_process_host.h" |
23 #include "chrome/browser/renderer_host/render_view_host.h" | 23 #include "chrome/browser/renderer_host/render_view_host.h" |
24 #include "chrome/browser/renderer_host/resource_dispatcher_host_request_info.h" | 24 #include "chrome/browser/renderer_host/resource_dispatcher_host_request_info.h" |
25 #include "chrome/browser/tab_contents/provisional_load_details.h" | 25 #include "chrome/browser/tab_contents/provisional_load_details.h" |
26 #include "chrome/browser/views/tab_contents/render_view_context_menu_views.h" | 26 #include "chrome/browser/views/tab_contents/render_view_context_menu_views.h" |
27 #include "chrome/browser/tab_contents/tab_contents.h" | 27 #include "chrome/browser/tab_contents/tab_contents.h" |
28 #include "chrome/browser/views/tab_contents/tab_contents_container.h" | 28 #include "chrome/browser/views/tab_contents/tab_contents_container.h" |
29 #include "chrome/common/bindings_policy.h" | 29 #include "chrome/common/bindings_policy.h" |
30 #include "chrome/common/chrome_constants.h" | 30 #include "chrome/common/chrome_constants.h" |
31 #include "chrome/common/render_messages.h" | 31 #include "chrome/common/render_messages.h" |
| 32 #include "chrome/common/render_messages_params.h" |
32 #include "chrome/common/native_web_keyboard_event.h" | 33 #include "chrome/common/native_web_keyboard_event.h" |
33 #include "chrome/common/notification_service.h" | 34 #include "chrome/common/notification_service.h" |
34 #include "chrome/common/page_transition_types.h" | 35 #include "chrome/common/page_transition_types.h" |
35 #include "chrome/test/automation/automation_messages.h" | 36 #include "chrome/test/automation/automation_messages.h" |
36 #include "grit/generated_resources.h" | 37 #include "grit/generated_resources.h" |
37 #include "views/grid_layout.h" | 38 #include "views/grid_layout.h" |
38 #include "views/widget/root_view.h" | 39 #include "views/widget/root_view.h" |
39 #include "views/window/window.h" | 40 #include "views/window/window.h" |
40 | 41 |
41 static const wchar_t kWindowObjectKey[] = L"ChromeWindowObject"; | 42 static const wchar_t kWindowObjectKey[] = L"ChromeWindowObject"; |
(...skipping 936 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
978 external_tab_view_->SetLayoutManager(layout); | 979 external_tab_view_->SetLayoutManager(layout); |
979 | 980 |
980 layout->StartRow(0, 0); | 981 layout->StartRow(0, 0); |
981 layout->AddView(info_bar_container); | 982 layout->AddView(info_bar_container); |
982 layout->StartRow(1, 0); | 983 layout->StartRow(1, 0); |
983 layout->AddView(tab_contents_container_); | 984 layout->AddView(tab_contents_container_); |
984 SetContentsView(external_tab_view_); | 985 SetContentsView(external_tab_view_); |
985 // Note that SetTabContents must be called after AddChildView is called | 986 // Note that SetTabContents must be called after AddChildView is called |
986 tab_contents_container_->ChangeTabContents(tab_contents_); | 987 tab_contents_container_->ChangeTabContents(tab_contents_); |
987 } | 988 } |
OLD | NEW |