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

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

Issue 312453002: Migrates Japanese IME IDs and stop migrating Chinese IME IDs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 6 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
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 <vector> 7 #include <vector>
8 8
9 #include "ash/autoclick/autoclick_controller.h" 9 #include "ash/autoclick/autoclick_controller.h"
10 #include "ash/magnifier/magnifier_constants.h" 10 #include "ash/magnifier/magnifier_constants.h"
(...skipping 566 matching lines...) Expand 10 before | Expand all | Expand 10 after
577 577
578 void Preferences::SetLanguageConfigStringListAsCSV(const char* section, 578 void Preferences::SetLanguageConfigStringListAsCSV(const char* section,
579 const char* name, 579 const char* name,
580 const std::string& value) { 580 const std::string& value) {
581 VLOG(1) << "Setting " << name << " to '" << value << "'"; 581 VLOG(1) << "Setting " << name << " to '" << value << "'";
582 582
583 std::vector<std::string> split_values; 583 std::vector<std::string> split_values;
584 if (!value.empty()) 584 if (!value.empty())
585 base::SplitString(value, ',', &split_values); 585 base::SplitString(value, ',', &split_values);
586 586
587 // TODO(shuchen): migration of the xkb id to extension-xkb id. 587 // Transfers the xkb id to extension-xkb id.
588 // Remove this function after few milestones are passed. 588 if (input_method_manager_->MigrateInputMethods(&split_values))
589 // See: http://crbug.com/345604
590 if (input_method_manager_->MigrateXkbInputMethods(&split_values))
591 preload_engines_.SetValue(JoinString(split_values, ',')); 589 preload_engines_.SetValue(JoinString(split_values, ','));
592 590
593 if (section == std::string(language_prefs::kGeneralSectionName) && 591 if (section == std::string(language_prefs::kGeneralSectionName) &&
594 name == std::string(language_prefs::kPreloadEnginesConfigName)) { 592 name == std::string(language_prefs::kPreloadEnginesConfigName)) {
595 input_method_manager_->ReplaceEnabledInputMethods(split_values); 593 input_method_manager_->ReplaceEnabledInputMethods(split_values);
596 return; 594 return;
597 } 595 }
598 } 596 }
599 597
600 void Preferences::SetInputMethodList() { 598 void Preferences::SetInputMethodList() {
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
641 touch_hud_projection_enabled_.SetValue(enabled); 639 touch_hud_projection_enabled_.SetValue(enabled);
642 } 640 }
643 641
644 void Preferences::ActiveUserChanged(const User* active_user) { 642 void Preferences::ActiveUserChanged(const User* active_user) {
645 if (active_user != user_) 643 if (active_user != user_)
646 return; 644 return;
647 ApplyPreferences(REASON_ACTIVE_USER_CHANGED, ""); 645 ApplyPreferences(REASON_ACTIVE_USER_CHANGED, "");
648 } 646 }
649 647
650 } // namespace chromeos 648 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698