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

Side by Side Diff: chrome/browser/chrome_browser_main.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 unified diff | Download patch
« no previous file with comments | « chrome/browser/browser_process_impl.cc ('k') | chrome/browser/first_run/first_run.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/chrome_browser_main.h" 5 #include "chrome/browser/chrome_browser_main.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 977 matching lines...) Expand 10 before | Expand all | Expand 10 after
988 // when this value will be updated. 988 // when this value will be updated.
989 local_state_->SetInt64(prefs::kVariationsSeedDate, 989 local_state_->SetInt64(prefs::kVariationsSeedDate,
990 base::Time::Now().ToInternalValue()); 990 base::Time::Now().ToInternalValue());
991 } 991 }
992 992
993 if (!master_prefs_->suppress_default_browser_prompt_for_version.empty()) { 993 if (!master_prefs_->suppress_default_browser_prompt_for_version.empty()) {
994 local_state_->SetString( 994 local_state_->SetString(
995 prefs::kBrowserSuppressDefaultBrowserPrompt, 995 prefs::kBrowserSuppressDefaultBrowserPrompt,
996 master_prefs_->suppress_default_browser_prompt_for_version); 996 master_prefs_->suppress_default_browser_prompt_for_version);
997 } 997 }
998
999 #if defined(OS_WIN)
1000 if (!master_prefs_->welcome_page_on_os_upgrade_enabled)
1001 local_state_->SetBoolean(prefs::kWelcomePageOnOSUpgradeEnabled, false);
1002 #endif
998 } 1003 }
999 #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) 1004 #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
1000 1005
1001 #if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_MACOSX) 1006 #if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_MACOSX)
1002 // Set the product channel for crash reports. 1007 // Set the product channel for crash reports.
1003 base::debug::SetCrashKeyValue(crash_keys::kChannel, 1008 base::debug::SetCrashKeyValue(crash_keys::kChannel,
1004 chrome::VersionInfo::GetVersionStringModifier()); 1009 chrome::VersionInfo::GetVersionStringModifier());
1005 #endif // defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_MACOSX) 1010 #endif // defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_MACOSX)
1006 1011
1007 // Initialize tracking synchronizer system. 1012 // Initialize tracking synchronizer system.
(...skipping 772 matching lines...) Expand 10 before | Expand all | Expand 10 after
1780 chromeos::CrosSettings::Shutdown(); 1785 chromeos::CrosSettings::Shutdown();
1781 #endif // defined(OS_CHROMEOS) 1786 #endif // defined(OS_CHROMEOS)
1782 #endif // defined(OS_ANDROID) 1787 #endif // defined(OS_ANDROID)
1783 } 1788 }
1784 1789
1785 // Public members: 1790 // Public members:
1786 1791
1787 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 1792 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
1788 chrome_extra_parts_.push_back(parts); 1793 chrome_extra_parts_.push_back(parts);
1789 } 1794 }
OLDNEW
« no previous file with comments | « chrome/browser/browser_process_impl.cc ('k') | chrome/browser/first_run/first_run.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698