diff options
author | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-21 09:43:14 +0000 |
---|---|---|
committer | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-21 09:43:14 +0000 |
commit | 291d8b76965a8025182add37c3b381aebece56ad (patch) | |
tree | c2e19f6fb57ce022a5821fefd1d97610eb2ee101 | |
parent | 6f63fd49ff65e5793e7acee2e3969e794d714ce1 (diff) | |
download | chromium_src-291d8b76965a8025182add37c3b381aebece56ad.zip chromium_src-291d8b76965a8025182add37c3b381aebece56ad.tar.gz chromium_src-291d8b76965a8025182add37c3b381aebece56ad.tar.bz2 |
Rename *language_library* to *input_method_library*.
TEST=trybots; make -j8 chrome unit_tests browser_tests
BUG=chromium-os:4063
Review URL: http://codereview.chromium.org/2875001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50341 0039d316-1c4b-4281-b951-d872f2087c98
21 files changed, 29 insertions, 29 deletions
diff --git a/chrome/browser/chromeos/cros/cros_in_process_browser_test.cc b/chrome/browser/chromeos/cros/cros_in_process_browser_test.cc index 3e00599..fcd72b3 100644 --- a/chrome/browser/chromeos/cros/cros_in_process_browser_test.cc +++ b/chrome/browser/chromeos/cros/cros_in_process_browser_test.cc @@ -11,7 +11,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/cros/mock_cryptohome_library.h" #include "chrome/browser/chromeos/cros/mock_keyboard_library.h" -#include "chrome/browser/chromeos/cros/mock_language_library.h" +#include "chrome/browser/chromeos/cros/mock_input_method_library.h" #include "chrome/browser/chromeos/cros/mock_library_loader.h" #include "chrome/browser/chromeos/cros/mock_network_library.h" #include "chrome/browser/chromeos/cros/mock_power_library.h" diff --git a/chrome/browser/chromeos/cros/cros_library.cc b/chrome/browser/chromeos/cros/cros_library.cc index e05956c..a99876b 100644 --- a/chrome/browser/chromeos/cros/cros_library.cc +++ b/chrome/browser/chromeos/cros/cros_library.cc @@ -6,8 +6,8 @@ #include "chrome/browser/chromeos/cros/cros_library_loader.h" #include "chrome/browser/chromeos/cros/cryptohome_library.h" +#include "chrome/browser/chromeos/cros/input_method_library.h" #include "chrome/browser/chromeos/cros/keyboard_library.h" -#include "chrome/browser/chromeos/cros/language_library.h" #include "chrome/browser/chromeos/cros/login_library.h" #include "chrome/browser/chromeos/cros/mount_library.h" #include "chrome/browser/chromeos/cros/network_library.h" diff --git a/chrome/browser/chromeos/cros/language_library.cc b/chrome/browser/chromeos/cros/input_method_library.cc index 0d377a5..de6a408 100644 --- a/chrome/browser/chromeos/cros/language_library.cc +++ b/chrome/browser/chromeos/cros/input_method_library.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/chromeos/cros/language_library.h" +#include "chrome/browser/chromeos/cros/input_method_library.h" #include "base/basictypes.h" #include "base/message_loop.h" diff --git a/chrome/browser/chromeos/cros/language_library.h b/chrome/browser/chromeos/cros/input_method_library.h index f961880..9cd670c 100644 --- a/chrome/browser/chromeos/cros/language_library.h +++ b/chrome/browser/chromeos/cros/input_method_library.h @@ -1,9 +1,9 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_CHROMEOS_CROS_LANGUAGE_LIBRARY_H_ -#define CHROME_BROWSER_CHROMEOS_CROS_LANGUAGE_LIBRARY_H_ +#ifndef CHROME_BROWSER_CHROMEOS_CROS_INPUT_METHOD_LIBRARY_H_ +#define CHROME_BROWSER_CHROMEOS_CROS_INPUT_METHOD_LIBRARY_H_ #include <map> #include <string> @@ -195,4 +195,4 @@ class InputMethodLibraryImpl : public InputMethodLibrary { } // namespace chromeos -#endif // CHROME_BROWSER_CHROMEOS_CROS_LANGUAGE_LIBRARY_H_ +#endif // CHROME_BROWSER_CHROMEOS_CROS_INPUT_METHOD_LIBRARY_H_ diff --git a/chrome/browser/chromeos/cros/mock_language_library.h b/chrome/browser/chromeos/cros/mock_input_method_library.h index 3a1cdbb..ccd0387 100644 --- a/chrome/browser/chromeos/cros/mock_language_library.h +++ b/chrome/browser/chromeos/cros/mock_input_method_library.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_CHROMEOS_CROS_MOCK_LANGUAGE_LIBRARY_H_ -#define CHROME_BROWSER_CHROMEOS_CROS_MOCK_LANGUAGE_LIBRARY_H_ +#ifndef CHROME_BROWSER_CHROMEOS_CROS_MOCK_INPUT_METHOD_LIBRARY_H_ +#define CHROME_BROWSER_CHROMEOS_CROS_MOCK_INPUT_METHOD_LIBRARY_H_ #include <string> -#include "chrome/browser/chromeos/cros/language_library.h" +#include "chrome/browser/chromeos/cros/input_method_library.h" #include "testing/gmock/include/gmock/gmock.h" namespace chromeos { @@ -36,5 +36,5 @@ class MockInputMethodLibrary : public InputMethodLibrary { } // namespace chromeos -#endif // CHROME_BROWSER_CHROMEOS_CROS_MOCK_LANGUAGE_LIBRARY_H_ +#endif // CHROME_BROWSER_CHROMEOS_CROS_MOCK_INPUT_METHOD_LIBRARY_H_ diff --git a/chrome/browser/chromeos/input_method/input_method_util.h b/chrome/browser/chromeos/input_method/input_method_util.h index 597ddec..0302b66 100644 --- a/chrome/browser/chromeos/input_method/input_method_util.h +++ b/chrome/browser/chromeos/input_method/input_method_util.h @@ -9,7 +9,7 @@ #include <vector> #include "base/string16.h" -#include "chrome/browser/chromeos/cros/language_library.h" +#include "chrome/browser/chromeos/cros/input_method_library.h" namespace chromeos { namespace input_method { diff --git a/chrome/browser/chromeos/login/login_browsertest.cc b/chrome/browser/chromeos/login/login_browsertest.cc index 64f01c4..042bacc 100644 --- a/chrome/browser/chromeos/login/login_browsertest.cc +++ b/chrome/browser/chromeos/login/login_browsertest.cc @@ -8,8 +8,8 @@ #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h" #include "chrome/browser/profile_manager.h" #include "chrome/browser/chromeos/cros/mock_cryptohome_library.h" +#include "chrome/browser/chromeos/cros/mock_input_method_library.h" #include "chrome/browser/chromeos/cros/mock_keyboard_library.h" -#include "chrome/browser/chromeos/cros/mock_language_library.h" #include "chrome/browser/chromeos/cros/mock_library_loader.h" #include "chrome/browser/chromeos/cros/mock_network_library.h" #include "chrome/browser/chromeos/cros/mock_power_library.h" diff --git a/chrome/browser/chromeos/login/screen_locker.cc b/chrome/browser/chromeos/login/screen_locker.cc index e8d156a..a767154 100644 --- a/chrome/browser/chromeos/login/screen_locker.cc +++ b/chrome/browser/chromeos/login/screen_locker.cc @@ -14,7 +14,7 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" -#include "chrome/browser/chromeos/cros/language_library.h" +#include "chrome/browser/chromeos/cros/input_method_library.h" #include "chrome/browser/chromeos/cros/screen_lock_library.h" #include "chrome/browser/chromeos/language_preferences.h" #include "chrome/browser/chromeos/login/authenticator.h" diff --git a/chrome/browser/chromeos/options/language_chewing_config_view.cc b/chrome/browser/chromeos/options/language_chewing_config_view.cc index 8ebe38e..1e52f22 100644 --- a/chrome/browser/chromeos/options/language_chewing_config_view.cc +++ b/chrome/browser/chromeos/options/language_chewing_config_view.cc @@ -8,7 +8,7 @@ #include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/cros/cros_library.h" -#include "chrome/browser/chromeos/cros/language_library.h" +#include "chrome/browser/chromeos/cros/input_method_library.h" #include "chrome/browser/chromeos/options/language_config_util.h" #include "chrome/browser/chromeos/preferences.h" #include "chrome/browser/profile.h" diff --git a/chrome/browser/chromeos/options/language_chewing_config_view.h b/chrome/browser/chromeos/options/language_chewing_config_view.h index cf12b7a..4e600a8 100644 --- a/chrome/browser/chromeos/options/language_chewing_config_view.h +++ b/chrome/browser/chromeos/options/language_chewing_config_view.h @@ -7,7 +7,7 @@ #include <string> -#include "chrome/browser/chromeos/cros/language_library.h" +#include "chrome/browser/chromeos/cros/input_method_library.h" #include "chrome/browser/chromeos/language_preferences.h" #include "chrome/browser/pref_member.h" #include "chrome/browser/views/options/options_page_view.h" diff --git a/chrome/browser/chromeos/options/language_config_model.cc b/chrome/browser/chromeos/options/language_config_model.cc index 81f9946..07c33bb 100644 --- a/chrome/browser/chromeos/options/language_config_model.cc +++ b/chrome/browser/chromeos/options/language_config_model.cc @@ -11,7 +11,7 @@ #include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/cros/cros_library.h" -#include "chrome/browser/chromeos/cros/language_library.h" +#include "chrome/browser/chromeos/cros/input_method_library.h" #include "chrome/browser/chromeos/input_method/input_method_util.h" #include "chrome/browser/chromeos/preferences.h" #include "chrome/common/notification_type.h" diff --git a/chrome/browser/chromeos/options/language_hangul_config_view.cc b/chrome/browser/chromeos/options/language_hangul_config_view.cc index 0b0d82b..e200f6f 100644 --- a/chrome/browser/chromeos/options/language_hangul_config_view.cc +++ b/chrome/browser/chromeos/options/language_hangul_config_view.cc @@ -10,7 +10,7 @@ #include "chrome/common/notification_type.h" #include "chrome/common/pref_names.h" #include "chrome/browser/chromeos/cros/cros_library.h" -#include "chrome/browser/chromeos/cros/language_library.h" +#include "chrome/browser/chromeos/cros/input_method_library.h" #include "chrome/browser/chromeos/language_preferences.h" #include "chrome/browser/chromeos/preferences.h" #include "chrome/browser/profile.h" diff --git a/chrome/browser/chromeos/options/language_hangul_config_view.h b/chrome/browser/chromeos/options/language_hangul_config_view.h index f0c9115..b36fa59 100644 --- a/chrome/browser/chromeos/options/language_hangul_config_view.h +++ b/chrome/browser/chromeos/options/language_hangul_config_view.h @@ -8,7 +8,7 @@ #include <string> #include "base/scoped_ptr.h" -#include "chrome/browser/chromeos/cros/language_library.h" +#include "chrome/browser/chromeos/cros/input_method_library.h" #include "chrome/browser/pref_member.h" #include "chrome/browser/views/options/options_page_view.h" #include "views/controls/combobox/combobox.h" diff --git a/chrome/browser/chromeos/options/language_mozc_config_view.h b/chrome/browser/chromeos/options/language_mozc_config_view.h index 173d028..2cb181b 100644 --- a/chrome/browser/chromeos/options/language_mozc_config_view.h +++ b/chrome/browser/chromeos/options/language_mozc_config_view.h @@ -8,7 +8,7 @@ #include <string> #include "base/scoped_ptr.h" -#include "chrome/browser/chromeos/cros/language_library.h" +#include "chrome/browser/chromeos/cros/input_method_library.h" #include "chrome/browser/chromeos/language_preferences.h" #include "chrome/browser/pref_member.h" #include "chrome/browser/views/options/options_page_view.h" diff --git a/chrome/browser/chromeos/options/language_pinyin_config_view.cc b/chrome/browser/chromeos/options/language_pinyin_config_view.cc index 9cd4b58..cfeb8f3 100644 --- a/chrome/browser/chromeos/options/language_pinyin_config_view.cc +++ b/chrome/browser/chromeos/options/language_pinyin_config_view.cc @@ -10,7 +10,7 @@ #include "chrome/common/notification_type.h" #include "chrome/common/pref_names.h" #include "chrome/browser/chromeos/cros/cros_library.h" -#include "chrome/browser/chromeos/cros/language_library.h" +#include "chrome/browser/chromeos/cros/input_method_library.h" #include "chrome/browser/chromeos/options/language_config_util.h" #include "chrome/browser/chromeos/preferences.h" #include "chrome/browser/profile.h" diff --git a/chrome/browser/chromeos/options/language_pinyin_config_view.h b/chrome/browser/chromeos/options/language_pinyin_config_view.h index 18f4414..71c40e1 100644 --- a/chrome/browser/chromeos/options/language_pinyin_config_view.h +++ b/chrome/browser/chromeos/options/language_pinyin_config_view.h @@ -7,7 +7,7 @@ #include <string> -#include "chrome/browser/chromeos/cros/language_library.h" +#include "chrome/browser/chromeos/cros/input_method_library.h" #include "chrome/browser/chromeos/language_preferences.h" #include "chrome/browser/pref_member.h" #include "chrome/browser/views/options/options_page_view.h" diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc index 04d02c1..b56add7 100644 --- a/chrome/browser/chromeos/preferences.cc +++ b/chrome/browser/chromeos/preferences.cc @@ -7,7 +7,7 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/cros/cros_library.h" -#include "chrome/browser/chromeos/cros/language_library.h" +#include "chrome/browser/chromeos/cros/input_method_library.h" #include "chrome/browser/chromeos/cros/synaptics_library.h" #include "chrome/browser/pref_member.h" #include "chrome/browser/pref_service.h" diff --git a/chrome/browser/chromeos/status/language_menu_button.h b/chrome/browser/chromeos/status/language_menu_button.h index d90f24e..a029b9d 100644 --- a/chrome/browser/chromeos/status/language_menu_button.h +++ b/chrome/browser/chromeos/status/language_menu_button.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_STATUS_LANGUAGE_MENU_BUTTON_H_ #include "app/menus/simple_menu_model.h" -#include "chrome/browser/chromeos/cros/language_library.h" +#include "chrome/browser/chromeos/cros/input_method_library.h" #include "chrome/browser/chromeos/status/status_area_button.h" #include "chrome/browser/pref_member.h" #include "chrome/common/notification_observer.h" diff --git a/chrome/browser/chromeos/status/language_menu_button_browsertest.cc b/chrome/browser/chromeos/status/language_menu_button_browsertest.cc index 976c2d9..79cd7b7 100644 --- a/chrome/browser/chromeos/status/language_menu_button_browsertest.cc +++ b/chrome/browser/chromeos/status/language_menu_button_browsertest.cc @@ -8,7 +8,7 @@ #include "chrome/browser/browser.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h" -#include "chrome/browser/chromeos/cros/mock_language_library.h" +#include "chrome/browser/chromeos/cros/mock_input_method_library.h" #include "chrome/browser/chromeos/frame/browser_view.h" #include "chrome/browser/chromeos/status/browser_status_area_view.h" #include "chrome/browser/chromeos/view_ids.h" diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 44d9d8f..2165a4f 100755 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -363,8 +363,8 @@ 'browser/chromeos/cros/cryptohome_library.h', 'browser/chromeos/cros/keyboard_library.cc', 'browser/chromeos/cros/keyboard_library.h', - 'browser/chromeos/cros/language_library.cc', - 'browser/chromeos/cros/language_library.h', + 'browser/chromeos/cros/input_method_library.cc', + 'browser/chromeos/cros/input_method_library.h', 'browser/chromeos/cros/login_library.cc', 'browser/chromeos/cros/login_library.h', 'browser/chromeos/cros/mount_library.cc', diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 713f990..23443c3 100755 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1466,7 +1466,7 @@ 'browser/chromeos/cros/mock_cros_library.h', 'browser/chromeos/cros/mock_cryptohome_library.h', 'browser/chromeos/cros/mock_keyboard_library.h', - 'browser/chromeos/cros/mock_language_library.h', + 'browser/chromeos/cros/mock_input_method_library.h', 'browser/chromeos/cros/mock_mount_library.cc', 'browser/chromeos/cros/mock_mount_library.h', 'browser/chromeos/cros/mock_network_library.h', |