| 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 <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "ash/autoclick/autoclick_controller.h" | 9 #include "ash/autoclick/autoclick_controller.h" |
| 10 #include "ash/display/display_manager.h" | 10 #include "ash/display/display_manager.h" |
| (...skipping 570 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 581 if (!value.empty()) { | 581 if (!value.empty()) { |
| 582 split_values = base::SplitString(value, ",", base::TRIM_WHITESPACE, | 582 split_values = base::SplitString(value, ",", base::TRIM_WHITESPACE, |
| 583 base::SPLIT_WANT_ALL); | 583 base::SPLIT_WANT_ALL); |
| 584 } | 584 } |
| 585 ime_state_->SetEnabledExtensionImes(&split_values); | 585 ime_state_->SetEnabledExtensionImes(&split_values); |
| 586 } | 586 } |
| 587 | 587 |
| 588 if (pref_name == prefs::kLangugaeImeMenuActivated && | 588 if (pref_name == prefs::kLangugaeImeMenuActivated && |
| 589 (reason == REASON_PREF_CHANGED || reason == REASON_ACTIVE_USER_CHANGED)) { | 589 (reason == REASON_PREF_CHANGED || reason == REASON_ACTIVE_USER_CHANGED)) { |
| 590 const bool activated = ime_menu_activated_.GetValue(); | 590 const bool activated = ime_menu_activated_.GetValue(); |
| 591 if (activated) | 591 input_method::InputMethodManager::Get()->ImeMenuActivationChanged( |
| 592 DVLOG(1) << "IME menu is activated."; | 592 activated); |
| 593 else | |
| 594 DVLOG(1) << "IME menu is deactivated."; | |
| 595 // TODO(azurewei): Fire inputMethodPrivate API event. | |
| 596 } | 593 } |
| 597 | 594 |
| 598 if (user_is_active) { | 595 if (user_is_active) { |
| 599 system::InputDeviceSettings::Get()->UpdateTouchpadSettings( | 596 system::InputDeviceSettings::Get()->UpdateTouchpadSettings( |
| 600 touchpad_settings); | 597 touchpad_settings); |
| 601 system::InputDeviceSettings::Get()->UpdateMouseSettings(mouse_settings); | 598 system::InputDeviceSettings::Get()->UpdateMouseSettings(mouse_settings); |
| 602 } | 599 } |
| 603 | 600 |
| 604 if (user_is_primary_ && (reason != REASON_PREF_CHANGED || | 601 if (user_is_primary_ && (reason != REASON_PREF_CHANGED || |
| 605 pref_name == prefs::kWakeOnWifiDarkConnect)) { | 602 pref_name == prefs::kWakeOnWifiDarkConnect)) { |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 729 touch_hud_projection_enabled_.SetValue(enabled); | 726 touch_hud_projection_enabled_.SetValue(enabled); |
| 730 } | 727 } |
| 731 | 728 |
| 732 void Preferences::ActiveUserChanged(const user_manager::User* active_user) { | 729 void Preferences::ActiveUserChanged(const user_manager::User* active_user) { |
| 733 if (active_user != user_) | 730 if (active_user != user_) |
| 734 return; | 731 return; |
| 735 ApplyPreferences(REASON_ACTIVE_USER_CHANGED, ""); | 732 ApplyPreferences(REASON_ACTIVE_USER_CHANGED, ""); |
| 736 } | 733 } |
| 737 | 734 |
| 738 } // namespace chromeos | 735 } // namespace chromeos |
| OLD | NEW |