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/chromeos/preferences.h" | 5 #include "chrome/browser/chromeos/preferences.h" |
6 | 6 |
7 #include "base/chromeos/chromeos_version.h" | 7 #include "base/chromeos/chromeos_version.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/i18n/time_formatting.h" | 9 #include "base/i18n/time_formatting.h" |
10 #include "base/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
(...skipping 566 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
577 if (!pref_name || *pref_name == prefs::kEnableCrosDRM) { | 577 if (!pref_name || *pref_name == prefs::kEnableCrosDRM) { |
578 system::ToggleDrm(enable_drm_.GetValue()); | 578 system::ToggleDrm(enable_drm_.GetValue()); |
579 } | 579 } |
580 | 580 |
581 // Change the download directory to the default value if a GData directory is | 581 // Change the download directory to the default value if a GData directory is |
582 // selected and GData is disabled. | 582 // selected and GData is disabled. |
583 if (!pref_name || *pref_name == prefs::kDisableGData) { | 583 if (!pref_name || *pref_name == prefs::kDisableGData) { |
584 if (disable_gdata_.GetValue()) { | 584 if (disable_gdata_.GetValue()) { |
585 const FilePath download_path = | 585 const FilePath download_path = |
586 prefs_->GetFilePath(prefs::kDownloadDefaultDirectory); | 586 prefs_->GetFilePath(prefs::kDownloadDefaultDirectory); |
587 if (gdata::util::IsUnderGDataMountPoint(download_path)) { | 587 if (gdata::util::IsUnderDriveMountPoint(download_path)) { |
588 prefs_->SetFilePath(prefs::kDownloadDefaultDirectory, | 588 prefs_->SetFilePath(prefs::kDownloadDefaultDirectory, |
589 download_util::GetDefaultDownloadDirectory()); | 589 download_util::GetDefaultDownloadDirectory()); |
590 } | 590 } |
591 } | 591 } |
592 } | 592 } |
593 } | 593 } |
594 | 594 |
595 void Preferences::SetLanguageConfigBoolean(const char* section, | 595 void Preferences::SetLanguageConfigBoolean(const char* section, |
596 const char* name, | 596 const char* name, |
597 bool value) { | 597 bool value) { |
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
683 | 683 |
684 input_method::AutoRepeatRate rate; | 684 input_method::AutoRepeatRate rate; |
685 rate.initial_delay_in_ms = xkb_auto_repeat_delay_pref_.GetValue(); | 685 rate.initial_delay_in_ms = xkb_auto_repeat_delay_pref_.GetValue(); |
686 rate.repeat_interval_in_ms = xkb_auto_repeat_interval_pref_.GetValue(); | 686 rate.repeat_interval_in_ms = xkb_auto_repeat_interval_pref_.GetValue(); |
687 DCHECK(rate.initial_delay_in_ms > 0); | 687 DCHECK(rate.initial_delay_in_ms > 0); |
688 DCHECK(rate.repeat_interval_in_ms > 0); | 688 DCHECK(rate.repeat_interval_in_ms > 0); |
689 input_method::XKeyboard::SetAutoRepeatRate(rate); | 689 input_method::XKeyboard::SetAutoRepeatRate(rate); |
690 } | 690 } |
691 | 691 |
692 } // namespace chromeos | 692 } // namespace chromeos |
OLD | NEW |