diff options
author | yusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-16 04:47:16 +0000 |
---|---|---|
committer | yusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-16 04:47:16 +0000 |
commit | eb21c1d6ec3dd475a7f9e0b1541c117d9041878a (patch) | |
tree | ebb41e6b8d396c433c63303fd1b3157a8b49a286 /chrome/browser/ui/webui/chromeos | |
parent | 268b12fc0dfbb5e074e55c41c4b320d6c3825d94 (diff) | |
download | chromium_src-eb21c1d6ec3dd475a7f9e0b1541c117d9041878a.zip chromium_src-eb21c1d6ec3dd475a7f9e0b1541c117d9041878a.tar.gz chromium_src-eb21c1d6ec3dd475a7f9e0b1541c117d9041878a.tar.bz2 |
Fix memory leaks caused by chrome/browser/chromeos/input_method/*.cc (part 1)
- Removed all global (and intentionally leaked) objects from InputMethodIdIsWhitelisted() and XkbLayoutIsSupported(). Instead, added Whitelist class. The duration of the whitelist object is managed by an IBusController object.
- Moved CreateInputMethodDescriptor() from InputMethodDescriptor to IBusController since it needs to access the whitelist object.
- Moved GetFallbackInputMethodDescriptor() and GetSupportedInputMethods() from InputMethodManager to InputMethodDescriptor.
BUG=chromium:48130
TEST=ran unit_tests under valgrind (without suppressions) and confirmed that no leaks were reported.
Review URL: http://codereview.chromium.org/7887032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101454 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/webui/chromeos')
-rw-r--r-- | chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc index b8742a1..112148e 100644 --- a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc @@ -179,7 +179,7 @@ ListValue* NetworkScreenHandler::GetLanguageList() { const std::string app_locale = g_browser_process->GetApplicationLocale(); // GetSupportedInputMethods() never returns NULL. scoped_ptr<input_method::InputMethodDescriptors> descriptors( - input_method::GetSupportedInputMethods()); + input_method::InputMethodDescriptor::GetSupportedInputMethods()); ListValue* languages_list = CrosLanguageOptionsHandler::GetLanguageList(*descriptors); for (size_t i = 0; i < languages_list->GetSize(); ++i) { |