| 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 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 294 DCHECK(local_state); | 294 DCHECK(local_state); |
| 295 | 295 |
| 296 // TODO(brettw,*): this comment about ResourceBundle was here since | 296 // TODO(brettw,*): this comment about ResourceBundle was here since |
| 297 // initial commit. This comment seems unrelated, bit-rotten and | 297 // initial commit. This comment seems unrelated, bit-rotten and |
| 298 // a candidate for removal. | 298 // a candidate for removal. |
| 299 // Initialize ResourceBundle which handles files loaded from external | 299 // Initialize ResourceBundle which handles files loaded from external |
| 300 // sources. This has to be done before uninstall code path and before prefs | 300 // sources. This has to be done before uninstall code path and before prefs |
| 301 // are registered. | 301 // are registered. |
| 302 local_state->RegisterStringPref(prefs::kApplicationLocale, std::string()); | 302 local_state->RegisterStringPref(prefs::kApplicationLocale, std::string()); |
| 303 #if defined(OS_CHROMEOS) | 303 #if defined(OS_CHROMEOS) |
| 304 local_state->RegisterStringPref(prefs::kOwnerLocale, std::string()); | |
| 305 local_state->RegisterStringPref(prefs::kHardwareKeyboardLayout, | 304 local_state->RegisterStringPref(prefs::kHardwareKeyboardLayout, |
| 306 std::string()); | 305 std::string()); |
| 306 local_state->RegisterStringPref(prefs::kOwnerLocale, std::string()); |
| 307 local_state->RegisterBooleanPref(prefs::kOwnerPrimaryMouseButtonRight, false); |
| 308 local_state->RegisterBooleanPref(prefs::kOwnerTapToClickEnabled, true); |
| 307 #endif // defined(OS_CHROMEOS) | 309 #endif // defined(OS_CHROMEOS) |
| 308 #if !defined(OS_CHROMEOS) | 310 #if !defined(OS_CHROMEOS) |
| 309 local_state->RegisterBooleanPref(prefs::kMetricsReportingEnabled, | 311 local_state->RegisterBooleanPref(prefs::kMetricsReportingEnabled, |
| 310 GoogleUpdateSettings::GetCollectStatsConsent()); | 312 GoogleUpdateSettings::GetCollectStatsConsent()); |
| 311 #endif // !defined(OS_CHROMEOS) | 313 #endif // !defined(OS_CHROMEOS) |
| 312 | 314 |
| 313 if (is_first_run) { | 315 if (is_first_run) { |
| 314 #if defined(OS_WIN) | 316 #if defined(OS_WIN) |
| 315 // During first run we read the google_update registry key to find what | 317 // During first run we read the google_update registry key to find what |
| 316 // language the user selected when downloading the installer. This | 318 // language the user selected when downloading the installer. This |
| (...skipping 1310 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1627 if (base::win::GetVersion() <= base::win::VERSION_XP) | 1629 if (base::win::GetVersion() <= base::win::VERSION_XP) |
| 1628 uma_name += "_XP"; | 1630 uma_name += "_XP"; |
| 1629 | 1631 |
| 1630 uma_name += "_PreRead_"; | 1632 uma_name += "_PreRead_"; |
| 1631 uma_name += pre_read_percentage; | 1633 uma_name += pre_read_percentage; |
| 1632 AddPreReadHistogramTime(uma_name.c_str(), time); | 1634 AddPreReadHistogramTime(uma_name.c_str(), time); |
| 1633 } | 1635 } |
| 1634 #endif | 1636 #endif |
| 1635 #endif | 1637 #endif |
| 1636 } | 1638 } |
| OLD | NEW |