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 <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
266 DCHECK(local_state); | 266 DCHECK(local_state); |
267 | 267 |
268 // TODO(brettw,*): this comment about ResourceBundle was here since | 268 // TODO(brettw,*): this comment about ResourceBundle was here since |
269 // initial commit. This comment seems unrelated, bit-rotten and | 269 // initial commit. This comment seems unrelated, bit-rotten and |
270 // a candidate for removal. | 270 // a candidate for removal. |
271 // Initialize ResourceBundle which handles files loaded from external | 271 // Initialize ResourceBundle which handles files loaded from external |
272 // sources. This has to be done before uninstall code path and before prefs | 272 // sources. This has to be done before uninstall code path and before prefs |
273 // are registered. | 273 // are registered. |
274 local_state->RegisterStringPref(prefs::kApplicationLocale, std::string()); | 274 local_state->RegisterStringPref(prefs::kApplicationLocale, std::string()); |
275 #if defined(OS_CHROMEOS) | 275 #if defined(OS_CHROMEOS) |
276 local_state->RegisterStringPref(prefs::kOwnerLocale, std::string()); | |
277 local_state->RegisterStringPref(prefs::kHardwareKeyboardLayout, | 276 local_state->RegisterStringPref(prefs::kHardwareKeyboardLayout, |
sky
2012/09/11 16:04:02
It doesn't scale to add platform specific prefs to
achuithb
2012/09/11 17:36:31
Maybe here:
http://code.google.com/codesearch#OAMl
Dmitry Polukhin
2012/09/12 11:32:12
We don't have any prefs registration in chrome_bro
Dmitry Polukhin
2012/09/12 14:31:09
Returned kOwnerLocale and kHardwareKeyboardLayout
| |
278 std::string()); | 277 std::string()); |
278 local_state->RegisterStringPref(prefs::kOwnerLocale, std::string()); | |
279 local_state->RegisterBooleanPref(prefs::kOwnerPrimaryMouseButtonRight, false); | |
280 local_state->RegisterBooleanPref(prefs::kOwnerTapToClickEnabled, true); | |
279 #endif // defined(OS_CHROMEOS) | 281 #endif // defined(OS_CHROMEOS) |
280 #if !defined(OS_CHROMEOS) | 282 #if !defined(OS_CHROMEOS) |
281 local_state->RegisterBooleanPref(prefs::kMetricsReportingEnabled, | 283 local_state->RegisterBooleanPref(prefs::kMetricsReportingEnabled, |
282 GoogleUpdateSettings::GetCollectStatsConsent()); | 284 GoogleUpdateSettings::GetCollectStatsConsent()); |
283 #endif // !defined(OS_CHROMEOS) | 285 #endif // !defined(OS_CHROMEOS) |
284 | 286 |
285 if (is_first_run) { | 287 if (is_first_run) { |
286 #if defined(OS_WIN) | 288 #if defined(OS_WIN) |
287 // During first run we read the google_update registry key to find what | 289 // During first run we read the google_update registry key to find what |
288 // language the user selected when downloading the installer. This | 290 // language the user selected when downloading the installer. This |
(...skipping 1297 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1586 if (base::win::GetVersion() <= base::win::VERSION_XP) | 1588 if (base::win::GetVersion() <= base::win::VERSION_XP) |
1587 uma_name += "_XP"; | 1589 uma_name += "_XP"; |
1588 | 1590 |
1589 uma_name += "_PreRead_"; | 1591 uma_name += "_PreRead_"; |
1590 uma_name += pre_read_percentage; | 1592 uma_name += pre_read_percentage; |
1591 AddPreReadHistogramTime(uma_name.c_str(), time); | 1593 AddPreReadHistogramTime(uma_name.c_str(), time); |
1592 } | 1594 } |
1593 #endif | 1595 #endif |
1594 #endif | 1596 #endif |
1595 } | 1597 } |
OLD | NEW |