Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(213)

Side by Side Diff: chrome/browser/browser_process_impl.cc

Issue 1657933003: Fixes the interactive default browser UX for policy setting (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1179 matching lines...) Expand 10 before | Expand all | Expand 10 after
1190 content::BrowserThread::UI), 1190 content::BrowserThread::UI),
1191 content::BrowserThread::GetMessageLoopProxyForThread( 1191 content::BrowserThread::GetMessageLoopProxyForThread(
1192 content::BrowserThread::IO), 1192 content::BrowserThread::IO),
1193 blocking_task_runner); 1193 blocking_task_runner);
1194 #endif // defined(OS_ANDROID) 1194 #endif // defined(OS_ANDROID)
1195 } 1195 }
1196 1196
1197 void BrowserProcessImpl::ApplyDefaultBrowserPolicy() { 1197 void BrowserProcessImpl::ApplyDefaultBrowserPolicy() {
1198 if (local_state()->GetBoolean(prefs::kDefaultBrowserSettingEnabled)) { 1198 if (local_state()->GetBoolean(prefs::kDefaultBrowserSettingEnabled)) {
1199 scoped_refptr<shell_integration::DefaultWebClientWorker> 1199 scoped_refptr<shell_integration::DefaultWebClientWorker>
1200 set_browser_worker = new shell_integration::DefaultBrowserWorker(NULL); 1200 set_browser_worker = new shell_integration::DefaultBrowserWorker(
1201 nullptr,
1202 /*delete_observer=*/false);
Nico 2016/02/10 17:33:58 add a comment where the deletino happens
Patrick Monette 2016/02/10 20:44:42 Done.
1203 // The user interaction must always be disabled when applying the default
1204 // browser policy since it is done at each browser startup and the result
1205 // of the interaction cannot be forced.
1206 set_browser_worker->set_interactive_permitted(false);
1201 set_browser_worker->StartSetAsDefault(); 1207 set_browser_worker->StartSetAsDefault();
1202 } 1208 }
1203 } 1209 }
1204 1210
1205 void BrowserProcessImpl::ApplyAllowCrossOriginAuthPromptPolicy() { 1211 void BrowserProcessImpl::ApplyAllowCrossOriginAuthPromptPolicy() {
1206 bool value = local_state()->GetBoolean(prefs::kAllowCrossOriginAuthPrompt); 1212 bool value = local_state()->GetBoolean(prefs::kAllowCrossOriginAuthPrompt);
1207 ResourceDispatcherHost::Get()->SetAllowCrossOriginAuthPrompt(value); 1213 ResourceDispatcherHost::Get()->SetAllowCrossOriginAuthPrompt(value);
1208 } 1214 }
1209 1215
1210 void BrowserProcessImpl::ApplyMetricsReportingPolicy() { 1216 void BrowserProcessImpl::ApplyMetricsReportingPolicy() {
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
1282 } 1288 }
1283 1289
1284 void BrowserProcessImpl::OnAutoupdateTimer() { 1290 void BrowserProcessImpl::OnAutoupdateTimer() {
1285 if (CanAutorestartForUpdate()) { 1291 if (CanAutorestartForUpdate()) {
1286 DLOG(WARNING) << "Detected update. Restarting browser."; 1292 DLOG(WARNING) << "Detected update. Restarting browser.";
1287 RestartBackgroundInstance(); 1293 RestartBackgroundInstance();
1288 } 1294 }
1289 } 1295 }
1290 1296
1291 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) 1297 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698