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/ui/browser.h" | 5 #include "chrome/browser/ui/browser.h" |
6 | 6 |
7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
8 #include <shellapi.h> | 8 #include <shellapi.h> |
9 #include <windows.h> | 9 #include <windows.h> |
10 #endif // OS_WIN | 10 #endif // OS_WIN |
(...skipping 10 matching lines...) Expand all Loading... |
21 #include "base/threading/thread.h" | 21 #include "base/threading/thread.h" |
22 #include "base/threading/thread_restrictions.h" | 22 #include "base/threading/thread_restrictions.h" |
23 #include "base/utf_string_conversions.h" | 23 #include "base/utf_string_conversions.h" |
24 #include "chrome/app/chrome_command_ids.h" | 24 #include "chrome/app/chrome_command_ids.h" |
25 #include "chrome/browser/autofill/autofill_manager.h" | 25 #include "chrome/browser/autofill/autofill_manager.h" |
26 #include "chrome/browser/bookmarks/bookmark_model.h" | 26 #include "chrome/browser/bookmarks/bookmark_model.h" |
27 #include "chrome/browser/bookmarks/bookmark_utils.h" | 27 #include "chrome/browser/bookmarks/bookmark_utils.h" |
28 #include "chrome/browser/browser_list.h" | 28 #include "chrome/browser/browser_list.h" |
29 #include "chrome/browser/browser_process.h" | 29 #include "chrome/browser/browser_process.h" |
30 #include "chrome/browser/browser_shutdown.h" | 30 #include "chrome/browser/browser_shutdown.h" |
| 31 #include "chrome/browser/browser_url_handler.h" |
31 #include "chrome/browser/browser_window.h" | 32 #include "chrome/browser/browser_window.h" |
32 #include "chrome/browser/browser_url_handler.h" | |
33 #include "chrome/browser/character_encoding.h" | 33 #include "chrome/browser/character_encoding.h" |
34 #include "chrome/browser/debugger/devtools_manager.h" | 34 #include "chrome/browser/debugger/devtools_manager.h" |
35 #include "chrome/browser/debugger/devtools_toggle_action.h" | 35 #include "chrome/browser/debugger/devtools_toggle_action.h" |
36 #include "chrome/browser/debugger/devtools_window.h" | 36 #include "chrome/browser/debugger/devtools_window.h" |
37 #include "chrome/browser/dom_ui/bug_report_ui.h" | |
38 #include "chrome/browser/dom_ui/filebrowse_ui.h" | 37 #include "chrome/browser/dom_ui/filebrowse_ui.h" |
39 #include "chrome/browser/dom_ui/options/content_settings_handler.h" | 38 #include "chrome/browser/dom_ui/options/content_settings_handler.h" |
40 #include "chrome/browser/download/download_item.h" | 39 #include "chrome/browser/download/download_item.h" |
41 #include "chrome/browser/download/download_item_model.h" | 40 #include "chrome/browser/download/download_item_model.h" |
42 #include "chrome/browser/download/download_manager.h" | 41 #include "chrome/browser/download/download_manager.h" |
43 #include "chrome/browser/download/download_shelf.h" | 42 #include "chrome/browser/download/download_shelf.h" |
44 #include "chrome/browser/download/download_started_animation.h" | 43 #include "chrome/browser/download/download_started_animation.h" |
45 #include "chrome/browser/extensions/crashed_extension_infobar.h" | 44 #include "chrome/browser/extensions/crashed_extension_infobar.h" |
46 #include "chrome/browser/extensions/crx_installer.h" | 45 #include "chrome/browser/extensions/crx_installer.h" |
47 #include "chrome/browser/extensions/extension_browser_event_router.h" | 46 #include "chrome/browser/extensions/extension_browser_event_router.h" |
48 #include "chrome/browser/extensions/extension_disabled_infobar_delegate.h" | 47 #include "chrome/browser/extensions/extension_disabled_infobar_delegate.h" |
49 #include "chrome/browser/extensions/extension_host.h" | 48 #include "chrome/browser/extensions/extension_host.h" |
50 #include "chrome/browser/extensions/extension_prefs.h" | 49 #include "chrome/browser/extensions/extension_prefs.h" |
| 50 #include "chrome/browser/extensions/extension_service.h" |
51 #include "chrome/browser/extensions/extension_tabs_module.h" | 51 #include "chrome/browser/extensions/extension_tabs_module.h" |
52 #include "chrome/browser/extensions/extension_service.h" | |
53 #include "chrome/browser/first_run/first_run.h" | 52 #include "chrome/browser/first_run/first_run.h" |
54 #include "chrome/browser/google/google_url_tracker.h" | 53 #include "chrome/browser/google/google_url_tracker.h" |
55 #include "chrome/browser/google/google_util.h" | 54 #include "chrome/browser/google/google_util.h" |
56 #include "chrome/browser/host_zoom_map.h" | 55 #include "chrome/browser/host_zoom_map.h" |
57 #include "chrome/browser/instant/instant_controller.h" | 56 #include "chrome/browser/instant/instant_controller.h" |
58 #include "chrome/browser/instant/instant_unload_handler.h" | 57 #include "chrome/browser/instant/instant_unload_handler.h" |
59 #include "chrome/browser/metrics/user_metrics.h" | 58 #include "chrome/browser/metrics/user_metrics.h" |
60 #include "chrome/browser/net/browser_url_util.h" | 59 #include "chrome/browser/net/browser_url_util.h" |
61 #include "chrome/browser/net/url_fixer_upper.h" | 60 #include "chrome/browser/net/url_fixer_upper.h" |
62 #include "chrome/browser/platform_util.h" | 61 #include "chrome/browser/platform_util.h" |
(...skipping 21 matching lines...) Expand all Loading... |
84 #include "chrome/browser/ui/omnibox/location_bar.h" | 83 #include "chrome/browser/ui/omnibox/location_bar.h" |
85 #include "chrome/browser/ui/options/options_window.h" | 84 #include "chrome/browser/ui/options/options_window.h" |
86 #include "chrome/browser/ui/search_engines/search_engine_tab_helper.h" | 85 #include "chrome/browser/ui/search_engines/search_engine_tab_helper.h" |
87 #include "chrome/browser/ui/status_bubble.h" | 86 #include "chrome/browser/ui/status_bubble.h" |
88 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 87 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
89 #include "chrome/browser/ui/tabs/dock_info.h" | 88 #include "chrome/browser/ui/tabs/dock_info.h" |
90 #include "chrome/browser/ui/tabs/tab_menu_model.h" | 89 #include "chrome/browser/ui/tabs/tab_menu_model.h" |
91 #include "chrome/browser/ui/window_sizer.h" | 90 #include "chrome/browser/ui/window_sizer.h" |
92 #include "chrome/browser/upgrade_detector.h" | 91 #include "chrome/browser/upgrade_detector.h" |
93 #include "chrome/browser/web_applications/web_app.h" | 92 #include "chrome/browser/web_applications/web_app.h" |
| 93 #include "chrome/browser/webui/bug_report_ui.h" |
94 #include "chrome/common/chrome_constants.h" | 94 #include "chrome/common/chrome_constants.h" |
95 #include "chrome/common/chrome_switches.h" | 95 #include "chrome/common/chrome_switches.h" |
96 #include "chrome/common/content_restriction.h" | 96 #include "chrome/common/content_restriction.h" |
97 #include "chrome/common/extensions/extension.h" | 97 #include "chrome/common/extensions/extension.h" |
98 #include "chrome/common/extensions/extension_constants.h" | 98 #include "chrome/common/extensions/extension_constants.h" |
99 #include "chrome/common/notification_service.h" | 99 #include "chrome/common/notification_service.h" |
100 #include "chrome/common/page_transition_types.h" | 100 #include "chrome/common/page_transition_types.h" |
101 #include "chrome/common/pref_names.h" | 101 #include "chrome/common/pref_names.h" |
102 #include "chrome/common/profiling.h" | 102 #include "chrome/common/profiling.h" |
103 #include "chrome/common/url_constants.h" | 103 #include "chrome/common/url_constants.h" |
(...skipping 10 matching lines...) Expand all Loading... |
114 #include "ui/base/l10n/l10n_util.h" | 114 #include "ui/base/l10n/l10n_util.h" |
115 #include "ui/gfx/point.h" | 115 #include "ui/gfx/point.h" |
116 #include "webkit/glue/webkit_glue.h" | 116 #include "webkit/glue/webkit_glue.h" |
117 #include "webkit/glue/window_open_disposition.h" | 117 #include "webkit/glue/window_open_disposition.h" |
118 | 118 |
119 #if defined(OS_WIN) | 119 #if defined(OS_WIN) |
120 #include "app/win/shell.h" | 120 #include "app/win/shell.h" |
121 #include "chrome/browser/autofill/autofill_ie_toolbar_import_win.h" | 121 #include "chrome/browser/autofill/autofill_ie_toolbar_import_win.h" |
122 #include "chrome/browser/browser_child_process_host.h" | 122 #include "chrome/browser/browser_child_process_host.h" |
123 #include "chrome/browser/download/save_package.h" | 123 #include "chrome/browser/download/save_package.h" |
| 124 #include "chrome/browser/shell_integration.h" |
124 #include "chrome/browser/ssl/ssl_error_info.h" | 125 #include "chrome/browser/ssl/ssl_error_info.h" |
125 #include "chrome/browser/shell_integration.h" | |
126 #include "chrome/browser/task_manager/task_manager.h" | 126 #include "chrome/browser/task_manager/task_manager.h" |
127 #include "chrome/browser/ui/view_ids.h" | 127 #include "chrome/browser/ui/view_ids.h" |
128 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" | 128 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" |
129 #endif // OS_WIN | 129 #endif // OS_WIN |
130 | 130 |
131 #if defined(OS_MACOSX) | 131 #if defined(OS_MACOSX) |
132 #include "chrome/browser/ui/cocoa/find_pasteboard.h" | 132 #include "chrome/browser/ui/cocoa/find_pasteboard.h" |
133 #endif | 133 #endif |
134 | 134 |
135 #if defined(OS_CHROMEOS) | 135 #if defined(OS_CHROMEOS) |
(...skipping 4240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4376 // The page transition below is only for the purpose of inserting the tab. | 4376 // The page transition below is only for the purpose of inserting the tab. |
4377 browser->AddTab(view_source_contents, PageTransition::LINK); | 4377 browser->AddTab(view_source_contents, PageTransition::LINK); |
4378 } | 4378 } |
4379 | 4379 |
4380 if (profile_->HasSessionService()) { | 4380 if (profile_->HasSessionService()) { |
4381 SessionService* session_service = profile_->GetSessionService(); | 4381 SessionService* session_service = profile_->GetSessionService(); |
4382 if (session_service) | 4382 if (session_service) |
4383 session_service->TabRestored(&view_source_contents->controller(), false); | 4383 session_service->TabRestored(&view_source_contents->controller(), false); |
4384 } | 4384 } |
4385 } | 4385 } |
OLD | NEW |