| 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/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 970 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 981 if (!master_prefs_->variations_seed_signature.empty()) { | 981 if (!master_prefs_->variations_seed_signature.empty()) { |
| 982 local_state_->SetString(prefs::kVariationsSeedSignature, | 982 local_state_->SetString(prefs::kVariationsSeedSignature, |
| 983 master_prefs_->variations_seed_signature); | 983 master_prefs_->variations_seed_signature); |
| 984 } | 984 } |
| 985 // Set the variation seed date to the current system time. If the user's | 985 // Set the variation seed date to the current system time. If the user's |
| 986 // clock is incorrect, this may cause some field trial expiry checks to | 986 // clock is incorrect, this may cause some field trial expiry checks to |
| 987 // not do the right thing until the next seed update from the server, | 987 // not do the right thing until the next seed update from the server, |
| 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 |
| 992 #if defined(OS_WIN) |
| 993 if (!master_prefs_->welcome_page_on_os_upgrade_enabled) |
| 994 local_state_->SetBoolean(prefs::kWelcomePageOnOSUpgradeEnabled, false); |
| 995 #endif |
| 991 } | 996 } |
| 992 | 997 |
| 993 if (!master_prefs_->suppress_default_browser_prompt_for_version.empty()) { | 998 if (!master_prefs_->suppress_default_browser_prompt_for_version.empty()) { |
| 994 local_state_->SetString( | 999 local_state_->SetString( |
| 995 prefs::kBrowserSuppressDefaultBrowserPrompt, | 1000 prefs::kBrowserSuppressDefaultBrowserPrompt, |
| 996 master_prefs_->suppress_default_browser_prompt_for_version); | 1001 master_prefs_->suppress_default_browser_prompt_for_version); |
| 997 } | 1002 } |
| 998 } | 1003 } |
| 999 #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) | 1004 #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) |
| 1000 | 1005 |
| (...skipping 779 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 } |
| OLD | NEW |