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

Side by Side Diff: chrome/browser/chromeos/input_method/input_method_util.cc

Issue 9721017: Rename ibus_input_methods.txt to input_methods.txt. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: re-retry Created 8 years, 9 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
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/input_method/input_method_util.h" 5 #include "chrome/browser/chromeos/input_method/input_method_util.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <functional> 8 #include <functional>
9 #include <map> 9 #include <map>
10 #include <utility> 10 #include <utility>
11 11
12 #include "base/basictypes.h" 12 #include "base/basictypes.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/string_split.h" 14 #include "base/string_split.h"
15 #include "base/string_util.h" 15 #include "base/string_util.h"
16 #include "base/utf_string_conversions.h" 16 #include "base/utf_string_conversions.h"
17 #include "chrome/browser/browser_process.h" 17 #include "chrome/browser/browser_process.h"
18 #include "chrome/browser/chromeos/input_method/ibus_input_methods.h"
19 #include "chrome/browser/chromeos/language_preferences.h" 18 #include "chrome/browser/chromeos/language_preferences.h"
20 #include "chrome/browser/prefs/pref_service.h" 19 #include "chrome/browser/prefs/pref_service.h"
21 #include "chrome/common/pref_names.h" 20 #include "chrome/common/pref_names.h"
22 #include "grit/generated_resources.h" 21 #include "grit/generated_resources.h"
23 #include "ui/base/l10n/l10n_util.h" 22 #include "ui/base/l10n/l10n_util.h"
24 #include "ui/base/l10n/l10n_util_collator.h" 23 #include "ui/base/l10n/l10n_util_collator.h"
25 #include "unicode/uloc.h" 24 #include "unicode/uloc.h"
26 25
27 namespace { 26 namespace {
28 27
(...skipping 605 matching lines...) Expand 10 before | Expand all | Expand 10 after
634 ReloadInternalMaps(); 633 ReloadInternalMaps();
635 } 634 }
636 635
637 void InputMethodUtil::SetHardwareInputMethodIdForTesting( 636 void InputMethodUtil::SetHardwareInputMethodIdForTesting(
638 const std::string& input_method_id) { 637 const std::string& input_method_id) {
639 hardware_input_method_id_for_testing_ = input_method_id; 638 hardware_input_method_id_for_testing_ = input_method_id;
640 } 639 }
641 640
642 } // namespace input_method 641 } // namespace input_method
643 } // namespace chromeos 642 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/input_method/input_method.gyp ('k') | chrome/browser/chromeos/input_method/input_method_whitelist.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698