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 <stddef.h> | 7 #include <stddef.h> |
8 #include <algorithm> | 8 #include <algorithm> |
9 #include <map> | 9 #include <map> |
10 #include <utility> | 10 #include <utility> |
(...skipping 1177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1188 content::BrowserThread::GetMessageLoopProxyForThread( | 1188 content::BrowserThread::GetMessageLoopProxyForThread( |
1189 content::BrowserThread::UI), | 1189 content::BrowserThread::UI), |
1190 content::BrowserThread::GetMessageLoopProxyForThread( | 1190 content::BrowserThread::GetMessageLoopProxyForThread( |
1191 content::BrowserThread::IO), | 1191 content::BrowserThread::IO), |
1192 blocking_task_runner); | 1192 blocking_task_runner); |
1193 #endif // defined(OS_ANDROID) | 1193 #endif // defined(OS_ANDROID) |
1194 } | 1194 } |
1195 | 1195 |
1196 void BrowserProcessImpl::ApplyDefaultBrowserPolicy() { | 1196 void BrowserProcessImpl::ApplyDefaultBrowserPolicy() { |
1197 if (local_state()->GetBoolean(prefs::kDefaultBrowserSettingEnabled)) { | 1197 if (local_state()->GetBoolean(prefs::kDefaultBrowserSettingEnabled)) { |
1198 scoped_refptr<ShellIntegration::DefaultWebClientWorker> | 1198 scoped_refptr<ShellIntegration::DefaultWebClientWorker> set_browser_worker = |
1199 set_browser_worker = new ShellIntegration::DefaultBrowserWorker(NULL); | 1199 new ShellIntegration::DefaultBrowserWorker(nullptr, false); |
| 1200 set_browser_worker->set_interactive_permitted(false); |
1200 set_browser_worker->StartSetAsDefault(); | 1201 set_browser_worker->StartSetAsDefault(); |
1201 } | 1202 } |
1202 } | 1203 } |
1203 | 1204 |
1204 void BrowserProcessImpl::ApplyAllowCrossOriginAuthPromptPolicy() { | 1205 void BrowserProcessImpl::ApplyAllowCrossOriginAuthPromptPolicy() { |
1205 bool value = local_state()->GetBoolean(prefs::kAllowCrossOriginAuthPrompt); | 1206 bool value = local_state()->GetBoolean(prefs::kAllowCrossOriginAuthPrompt); |
1206 ResourceDispatcherHost::Get()->SetAllowCrossOriginAuthPrompt(value); | 1207 ResourceDispatcherHost::Get()->SetAllowCrossOriginAuthPrompt(value); |
1207 } | 1208 } |
1208 | 1209 |
1209 void BrowserProcessImpl::ApplyMetricsReportingPolicy() { | 1210 void BrowserProcessImpl::ApplyMetricsReportingPolicy() { |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1276 } | 1277 } |
1277 | 1278 |
1278 void BrowserProcessImpl::OnAutoupdateTimer() { | 1279 void BrowserProcessImpl::OnAutoupdateTimer() { |
1279 if (CanAutorestartForUpdate()) { | 1280 if (CanAutorestartForUpdate()) { |
1280 DLOG(WARNING) << "Detected update. Restarting browser."; | 1281 DLOG(WARNING) << "Detected update. Restarting browser."; |
1281 RestartBackgroundInstance(); | 1282 RestartBackgroundInstance(); |
1282 } | 1283 } |
1283 } | 1284 } |
1284 | 1285 |
1285 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1286 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
OLD | NEW |