Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(26)

Side by Side Diff: chrome/browser/chromeos/preferences.cc

Issue 10689101: chromeos: screen_locker_settings -> power_manager_settings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/chromeos/system/power_manager_settings.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
11 #include "base/string_split.h" 11 #include "base/string_split.h"
12 #include "base/string_util.h" 12 #include "base/string_util.h"
13 #include "base/utf_string_conversions.h" 13 #include "base/utf_string_conversions.h"
14 #include "chrome/browser/browser_process.h" 14 #include "chrome/browser/browser_process.h"
15 #include "chrome/browser/chromeos/input_method/input_method_manager.h" 15 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
16 #include "chrome/browser/chromeos/input_method/input_method_util.h" 16 #include "chrome/browser/chromeos/input_method/input_method_util.h"
17 #include "chrome/browser/chromeos/input_method/xkeyboard.h" 17 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
18 #include "chrome/browser/chromeos/login/login_utils.h" 18 #include "chrome/browser/chromeos/login/login_utils.h"
19 #include "chrome/browser/chromeos/system/drm_settings.h" 19 #include "chrome/browser/chromeos/system/drm_settings.h"
20 #include "chrome/browser/chromeos/system/input_device_settings.h" 20 #include "chrome/browser/chromeos/system/input_device_settings.h"
21 #include "chrome/browser/chromeos/system/screen_locker_settings.h" 21 #include "chrome/browser/chromeos/system/power_manager_settings.h"
22 #include "chrome/browser/chromeos/system/statistics_provider.h" 22 #include "chrome/browser/chromeos/system/statistics_provider.h"
23 #include "chrome/browser/prefs/pref_member.h" 23 #include "chrome/browser/prefs/pref_member.h"
24 #include "chrome/browser/prefs/pref_service.h" 24 #include "chrome/browser/prefs/pref_service.h"
25 #include "chrome/browser/prefs/scoped_user_pref_update.h" 25 #include "chrome/browser/prefs/scoped_user_pref_update.h"
26 #include "chrome/common/chrome_notification_types.h" 26 #include "chrome/common/chrome_notification_types.h"
27 #include "chrome/common/chrome_switches.h" 27 #include "chrome/common/chrome_switches.h"
28 #include "chrome/common/pref_names.h" 28 #include "chrome/common/pref_names.h"
29 #include "content/public/browser/notification_details.h" 29 #include "content/public/browser/notification_details.h"
30 #include "content/public/browser/notification_source.h" 30 #include "content/public/browser/notification_source.h"
31 #include "googleurl/src/gurl.h" 31 #include "googleurl/src/gurl.h"
(...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after
546 *pref_name == language_prefs::kMozcIntegerPrefs[i].pref_name) { 546 *pref_name == language_prefs::kMozcIntegerPrefs[i].pref_name) {
547 SetLanguageConfigInteger( 547 SetLanguageConfigInteger(
548 language_prefs::kMozcSectionName, 548 language_prefs::kMozcSectionName,
549 language_prefs::kMozcIntegerPrefs[i].ibus_config_name, 549 language_prefs::kMozcIntegerPrefs[i].ibus_config_name,
550 mozc_integer_prefs_[i].GetValue()); 550 mozc_integer_prefs_[i].GetValue());
551 } 551 }
552 } 552 }
553 553
554 // Init or update power manager config. 554 // Init or update power manager config.
555 if (!pref_name || *pref_name == prefs::kEnableScreenLock) { 555 if (!pref_name || *pref_name == prefs::kEnableScreenLock) {
556 system::screen_locker_settings::EnableScreenLock( 556 system::power_manager_settings::EnableScreenLock(
557 enable_screen_lock_.GetValue()); 557 enable_screen_lock_.GetValue());
558 } 558 }
559 559
560 // Init or update protected content (DRM) support. 560 // Init or update protected content (DRM) support.
561 if (!pref_name || *pref_name == prefs::kEnableCrosDRM) { 561 if (!pref_name || *pref_name == prefs::kEnableCrosDRM) {
562 system::ToggleDrm(enable_drm_.GetValue()); 562 system::ToggleDrm(enable_drm_.GetValue());
563 } 563 }
564 } 564 }
565 565
566 void Preferences::SetLanguageConfigBoolean(const char* section, 566 void Preferences::SetLanguageConfigBoolean(const char* section,
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
654 654
655 input_method::AutoRepeatRate rate; 655 input_method::AutoRepeatRate rate;
656 rate.initial_delay_in_ms = xkb_auto_repeat_delay_pref_.GetValue(); 656 rate.initial_delay_in_ms = xkb_auto_repeat_delay_pref_.GetValue();
657 rate.repeat_interval_in_ms = xkb_auto_repeat_interval_pref_.GetValue(); 657 rate.repeat_interval_in_ms = xkb_auto_repeat_interval_pref_.GetValue();
658 DCHECK(rate.initial_delay_in_ms > 0); 658 DCHECK(rate.initial_delay_in_ms > 0);
659 DCHECK(rate.repeat_interval_in_ms > 0); 659 DCHECK(rate.repeat_interval_in_ms > 0);
660 input_method::XKeyboard::SetAutoRepeatRate(rate); 660 input_method::XKeyboard::SetAutoRepeatRate(rate);
661 } 661 }
662 662
663 } // namespace chromeos 663 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/system/power_manager_settings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698