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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
84 #include "chrome/browser/ui/webui/filebrowse_ui.h" | 84 #include "chrome/browser/ui/webui/filebrowse_ui.h" |
85 #include "chrome/browser/ui/webui/options/content_settings_handler.h" | 85 #include "chrome/browser/ui/webui/options/content_settings_handler.h" |
86 #include "chrome/browser/ui/window_sizer.h" | 86 #include "chrome/browser/ui/window_sizer.h" |
87 #include "chrome/browser/upgrade_detector.h" | 87 #include "chrome/browser/upgrade_detector.h" |
88 #include "chrome/browser/web_applications/web_app.h" | 88 #include "chrome/browser/web_applications/web_app.h" |
89 #include "chrome/common/chrome_constants.h" | 89 #include "chrome/common/chrome_constants.h" |
90 #include "chrome/common/chrome_switches.h" | 90 #include "chrome/common/chrome_switches.h" |
91 #include "chrome/common/content_restriction.h" | 91 #include "chrome/common/content_restriction.h" |
92 #include "chrome/common/extensions/extension.h" | 92 #include "chrome/common/extensions/extension.h" |
93 #include "chrome/common/extensions/extension_constants.h" | 93 #include "chrome/common/extensions/extension_constants.h" |
94 #include "chrome/common/page_transition_types.h" | |
95 #include "chrome/common/pref_names.h" | 94 #include "chrome/common/pref_names.h" |
96 #include "chrome/common/profiling.h" | 95 #include "chrome/common/profiling.h" |
97 #include "chrome/common/url_constants.h" | 96 #include "chrome/common/url_constants.h" |
98 #include "chrome/common/web_apps.h" | 97 #include "chrome/common/web_apps.h" |
99 #include "content/browser/host_zoom_map.h" | 98 #include "content/browser/host_zoom_map.h" |
100 #include "content/browser/renderer_host/render_view_host.h" | 99 #include "content/browser/renderer_host/render_view_host.h" |
101 #include "content/browser/site_instance.h" | 100 #include "content/browser/site_instance.h" |
102 #include "content/browser/tab_contents/interstitial_page.h" | 101 #include "content/browser/tab_contents/interstitial_page.h" |
103 #include "content/browser/tab_contents/navigation_controller.h" | 102 #include "content/browser/tab_contents/navigation_controller.h" |
104 #include "content/browser/tab_contents/navigation_entry.h" | 103 #include "content/browser/tab_contents/navigation_entry.h" |
105 #include "content/browser/tab_contents/tab_contents.h" | 104 #include "content/browser/tab_contents/tab_contents.h" |
106 #include "content/browser/tab_contents/tab_contents_view.h" | 105 #include "content/browser/tab_contents/tab_contents_view.h" |
107 #include "content/common/notification_service.h" | 106 #include "content/common/notification_service.h" |
| 107 #include "content/common/page_transition_types.h" |
108 #include "grit/chromium_strings.h" | 108 #include "grit/chromium_strings.h" |
109 #include "grit/generated_resources.h" | 109 #include "grit/generated_resources.h" |
110 #include "grit/locale_settings.h" | 110 #include "grit/locale_settings.h" |
111 #include "net/base/cookie_monster.h" | 111 #include "net/base/cookie_monster.h" |
112 #include "net/base/net_util.h" | 112 #include "net/base/net_util.h" |
113 #include "net/base/registry_controlled_domain.h" | 113 #include "net/base/registry_controlled_domain.h" |
114 #include "net/base/static_cookie_policy.h" | 114 #include "net/base/static_cookie_policy.h" |
115 #include "net/url_request/url_request_context.h" | 115 #include "net/url_request/url_request_context.h" |
116 #include "ui/base/animation/animation.h" | 116 #include "ui/base/animation/animation.h" |
117 #include "ui/base/l10n/l10n_util.h" | 117 #include "ui/base/l10n/l10n_util.h" |
(...skipping 4306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4424 // The page transition below is only for the purpose of inserting the tab. | 4424 // The page transition below is only for the purpose of inserting the tab. |
4425 browser->AddTab(view_source_contents, PageTransition::LINK); | 4425 browser->AddTab(view_source_contents, PageTransition::LINK); |
4426 } | 4426 } |
4427 | 4427 |
4428 if (profile_->HasSessionService()) { | 4428 if (profile_->HasSessionService()) { |
4429 SessionService* session_service = profile_->GetSessionService(); | 4429 SessionService* session_service = profile_->GetSessionService(); |
4430 if (session_service) | 4430 if (session_service) |
4431 session_service->TabRestored(&view_source_contents->controller(), false); | 4431 session_service->TabRestored(&view_source_contents->controller(), false); |
4432 } | 4432 } |
4433 } | 4433 } |
OLD | NEW |