Chromium Code Reviews| 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 <algorithm> | 7 #include <algorithm> |
| 8 #include <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 176 // Must be created after the NotificationService. | 176 // Must be created after the NotificationService. |
| 177 print_job_manager_.reset(new printing::PrintJobManager); | 177 print_job_manager_.reset(new printing::PrintJobManager); |
| 178 #endif | 178 #endif |
| 179 | 179 |
| 180 net_log_.reset(new ChromeNetLog); | 180 net_log_.reset(new ChromeNetLog); |
| 181 | 181 |
| 182 ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( | 182 ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( |
| 183 extensions::kExtensionScheme); | 183 extensions::kExtensionScheme); |
| 184 ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( | 184 ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( |
| 185 chrome::kExtensionResourceScheme); | 185 chrome::kExtensionResourceScheme); |
| 186 ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( | |
| 187 chrome::kChromeSearchScheme); | |
|
Charlie Reis
2013/03/02 04:41:09
This means FilterURL won't complain if it sees chr
dhollowa
2013/03/04 18:39:35
The cross-origin checks block this normally on the
| |
| 186 | 188 |
| 187 #if defined(OS_MACOSX) | 189 #if defined(OS_MACOSX) |
| 188 InitIdleMonitor(); | 190 InitIdleMonitor(); |
| 189 #endif | 191 #endif |
| 190 | 192 |
| 191 extension_event_router_forwarder_ = new extensions::EventRouterForwarder; | 193 extension_event_router_forwarder_ = new extensions::EventRouterForwarder; |
| 192 | 194 |
| 193 ExtensionRendererState::GetInstance()->Init(); | 195 ExtensionRendererState::GetInstance()->Init(); |
| 194 } | 196 } |
| 195 | 197 |
| (...skipping 836 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1032 } | 1034 } |
| 1033 | 1035 |
| 1034 void BrowserProcessImpl::OnAutoupdateTimer() { | 1036 void BrowserProcessImpl::OnAutoupdateTimer() { |
| 1035 if (CanAutorestartForUpdate()) { | 1037 if (CanAutorestartForUpdate()) { |
| 1036 DLOG(WARNING) << "Detected update. Restarting browser."; | 1038 DLOG(WARNING) << "Detected update. Restarting browser."; |
| 1037 RestartBackgroundInstance(); | 1039 RestartBackgroundInstance(); |
| 1038 } | 1040 } |
| 1039 } | 1041 } |
| 1040 | 1042 |
| 1041 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1043 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
| OLD | NEW |