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/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 thumbnail_generator_(new ThumbnailGenerator), | 139 thumbnail_generator_(new ThumbnailGenerator), |
140 download_status_updater_(new DownloadStatusUpdater) { | 140 download_status_updater_(new DownloadStatusUpdater) { |
141 g_browser_process = this; | 141 g_browser_process = this; |
142 clipboard_.reset(new ui::Clipboard); | 142 clipboard_.reset(new ui::Clipboard); |
143 | 143 |
144 // Must be created after the NotificationService. | 144 // Must be created after the NotificationService. |
145 print_job_manager_.reset(new printing::PrintJobManager); | 145 print_job_manager_.reset(new printing::PrintJobManager); |
146 | 146 |
147 net_log_.reset(new ChromeNetLog); | 147 net_log_.reset(new ChromeNetLog); |
148 | 148 |
149 ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( | 149 ChildProcessSecurityPolicy* policy = |
150 chrome::kExtensionScheme); | 150 ChildProcessSecurityPolicy::GetInstance(); |
151 policy->RegisterWebSafeScheme(chrome::kExtensionScheme); | |
152 policy->RegisterWebSafeScheme(chrome::kChromeDevToolsScheme); | |
abarth-chromium
2011/12/01 00:22:35
Why is dev tools web-safe? You shouldn't be able
Tom Sepez
2011/12/01 00:43:36
Looks like this is in response to breaking the dev
| |
153 policy->RegisterPseudoScheme(chrome::kChromeUIScheme); | |
abarth-chromium
2011/12/01 00:22:35
Why is ChromeUIScheme a pseudo scheme? That doesn
Tom Sepez
2011/12/01 00:43:36
This has to do with ChildProcessSecurityPolicy::Ca
| |
151 | 154 |
152 extension_event_router_forwarder_ = new ExtensionEventRouterForwarder; | 155 extension_event_router_forwarder_ = new ExtensionEventRouterForwarder; |
153 | 156 |
154 ExtensionTabIdMap::GetInstance()->Init(); | 157 ExtensionTabIdMap::GetInstance()->Init(); |
155 | 158 |
156 online_state_observer_.reset(new BrowserOnlineStateObserver); | 159 online_state_observer_.reset(new BrowserOnlineStateObserver); |
157 } | 160 } |
158 | 161 |
159 BrowserProcessImpl::~BrowserProcessImpl() { | 162 BrowserProcessImpl::~BrowserProcessImpl() { |
160 // See StartTearDown and PreStopThread functions below, this is where | 163 // See StartTearDown and PreStopThread functions below, this is where |
(...skipping 847 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1008 } | 1011 } |
1009 | 1012 |
1010 void BrowserProcessImpl::OnAutoupdateTimer() { | 1013 void BrowserProcessImpl::OnAutoupdateTimer() { |
1011 if (CanAutorestartForUpdate()) { | 1014 if (CanAutorestartForUpdate()) { |
1012 DLOG(WARNING) << "Detected update. Restarting browser."; | 1015 DLOG(WARNING) << "Detected update. Restarting browser."; |
1013 RestartBackgroundInstance(); | 1016 RestartBackgroundInstance(); |
1014 } | 1017 } |
1015 } | 1018 } |
1016 | 1019 |
1017 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1020 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
OLD | NEW |