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

Unified Diff: chrome/browser/browser_process_impl.cc

Issue 1226643002: Welcome page changes for Windows 10 and over. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rewording in policy_templates.json and sync to position 338549 Created 5 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/browser_process_impl.h ('k') | chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_process_impl.cc
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 330ff8abb1d6d778691b7b3b7353f29dd483755a..53d73e9f20e97076d78d411fa33f383b531e3d6f 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -183,7 +183,8 @@ BrowserProcessImpl::BrowserProcessImpl(
module_ref_count_(0),
did_start_(false),
download_status_updater_(new DownloadStatusUpdater),
- local_state_task_runner_(local_state_task_runner) {
+ local_state_task_runner_(local_state_task_runner),
+ cached_default_web_client_state_(ShellIntegration::UNKNOWN_DEFAULT) {
g_browser_process = this;
platform_part_.reset(new BrowserProcessPlatformPart());
@@ -782,6 +783,11 @@ memory::OomPriorityManager* BrowserProcessImpl::GetOomPriorityManager() {
#endif
}
+ShellIntegration::DefaultWebClientState
+BrowserProcessImpl::CachedDefaultWebClientState() {
+ return cached_default_web_client_state_;
+}
+
// static
void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) {
registry->RegisterBooleanPref(prefs::kDefaultBrowserSettingEnabled,
@@ -1081,6 +1087,8 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
child_process_watcher_.reset(new ChromeChildProcessWatcher());
+ CacheDefaultWebClientState();
+
platform_part_->PreMainMessageLoopRun();
}
@@ -1192,6 +1200,14 @@ void BrowserProcessImpl::ApplyMetricsReportingPolicy() {
#endif
}
+void BrowserProcessImpl::CacheDefaultWebClientState() {
+#if defined(OS_CHROMEOS)
+ cached_default_web_client_state_ = ShellIntegration::IS_DEFAULT;
+#elif !defined(OS_ANDROID) && !defined(OS_IOS)
+ cached_default_web_client_state_ = ShellIntegration::GetDefaultBrowser();
+#endif
+}
+
// Mac is currently not supported.
#if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
« no previous file with comments | « chrome/browser/browser_process_impl.h ('k') | chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698