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/browser_process_impl.h" | 5 #include "chrome/browser/browser_process_impl.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <set> | 8 #include <set> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
139 | 139 |
140 #if !defined(OS_ANDROID) | 140 #if !defined(OS_ANDROID) |
141 // Must be created after the NotificationService. | 141 // Must be created after the NotificationService. |
142 print_job_manager_.reset(new printing::PrintJobManager); | 142 print_job_manager_.reset(new printing::PrintJobManager); |
143 #endif | 143 #endif |
144 | 144 |
145 net_log_.reset(new ChromeNetLog); | 145 net_log_.reset(new ChromeNetLog); |
146 | 146 |
147 ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( | 147 ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( |
148 chrome::kExtensionScheme); | 148 chrome::kExtensionScheme); |
| 149 ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( |
| 150 chrome::kExtensionResourceScheme); |
149 | 151 |
150 extension_event_router_forwarder_ = new ExtensionEventRouterForwarder; | 152 extension_event_router_forwarder_ = new ExtensionEventRouterForwarder; |
151 | 153 |
152 ExtensionTabIdMap::GetInstance()->Init(); | 154 ExtensionTabIdMap::GetInstance()->Init(); |
153 } | 155 } |
154 | 156 |
155 BrowserProcessImpl::~BrowserProcessImpl() { | 157 BrowserProcessImpl::~BrowserProcessImpl() { |
156 #if !defined(OS_ANDROID) | 158 #if !defined(OS_ANDROID) |
157 // Wait for the pending print jobs to finish. | 159 // Wait for the pending print jobs to finish. |
158 print_job_manager_->OnQuit(); | 160 print_job_manager_->OnQuit(); |
(...skipping 756 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
915 } | 917 } |
916 | 918 |
917 void BrowserProcessImpl::OnAutoupdateTimer() { | 919 void BrowserProcessImpl::OnAutoupdateTimer() { |
918 if (CanAutorestartForUpdate()) { | 920 if (CanAutorestartForUpdate()) { |
919 DLOG(WARNING) << "Detected update. Restarting browser."; | 921 DLOG(WARNING) << "Detected update. Restarting browser."; |
920 RestartBackgroundInstance(); | 922 RestartBackgroundInstance(); |
921 } | 923 } |
922 } | 924 } |
923 | 925 |
924 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 926 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
OLD | NEW |