OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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/installer/util/master_preferences.h" | 5 #include "chrome/installer/util/master_preferences.h" |
6 | 6 |
7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
10 #include "chrome/common/json_value_serializer.h" | 10 #include "chrome/common/json_value_serializer.h" |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
72 const wchar_t kRequireEula[] = L"require_eula"; | 72 const wchar_t kRequireEula[] = L"require_eula"; |
73 // Use alternate shortcut text for the main shortcut. | 73 // Use alternate shortcut text for the main shortcut. |
74 const wchar_t kAltShortcutText[] = L"alternate_shortcut_text"; | 74 const wchar_t kAltShortcutText[] = L"alternate_shortcut_text"; |
75 // Use alternate smaller first run info bubble. | 75 // Use alternate smaller first run info bubble. |
76 const wchar_t kAltFirstRunBubble[] = L"oem_bubble"; | 76 const wchar_t kAltFirstRunBubble[] = L"oem_bubble"; |
77 // Boolean pref that triggers silent import of the default browser homepage. | 77 // Boolean pref that triggers silent import of the default browser homepage. |
78 const wchar_t kDistroImportHomePagePref[] = L"import_home_page"; | 78 const wchar_t kDistroImportHomePagePref[] = L"import_home_page"; |
79 | 79 |
80 bool GetDistributionPingDelay(const FilePath& master_prefs_path, | 80 bool GetDistributionPingDelay(const FilePath& master_prefs_path, |
81 int& delay) { | 81 int& delay) { |
| 82 // 90 seconds is the default that we want to use in case master preferences |
| 83 // is missing or corrupt. |
| 84 delay = 90; |
82 FilePath master_prefs = master_prefs_path; | 85 FilePath master_prefs = master_prefs_path; |
83 if (master_prefs.empty()) { | 86 if (master_prefs.empty()) { |
84 if (!PathService::Get(base::DIR_EXE, &master_prefs)) | 87 if (!PathService::Get(base::DIR_EXE, &master_prefs)) |
85 return false; | 88 return false; |
86 master_prefs = master_prefs.Append(installer_util::kDefaultMasterPrefs); | 89 master_prefs = master_prefs.Append(installer_util::kDefaultMasterPrefs); |
87 } | 90 } |
88 | 91 |
89 if (!file_util::PathExists(master_prefs)) | 92 if (!file_util::PathExists(master_prefs)) |
90 return false; | 93 return false; |
91 | 94 |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
163 if (!tabs_list->Get(i, &entry) || !entry->GetAsString(&tab_entry)) { | 166 if (!tabs_list->Get(i, &entry) || !entry->GetAsString(&tab_entry)) { |
164 NOTREACHED(); | 167 NOTREACHED(); |
165 break; | 168 break; |
166 } | 169 } |
167 launch_tabs.push_back(tab_entry); | 170 launch_tabs.push_back(tab_entry); |
168 } | 171 } |
169 return launch_tabs; | 172 return launch_tabs; |
170 } | 173 } |
171 | 174 |
172 } // installer_util | 175 } // installer_util |
OLD | NEW |