diff options
| author | penghuang@chromium.org <penghuang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-11 05:51:59 +0000 |
|---|---|---|
| committer | penghuang@chromium.org <penghuang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-11 05:51:59 +0000 |
| commit | db2a40cb3b29bd4a953fe604fdbcbecaf644a92b (patch) | |
| tree | 3ccd73e5e8a07f55443a35f178588ad558036f55 /chrome | |
| parent | 87b2340fe6caf4ab30ced2df82479d2d463581e4 (diff) | |
| download | chromium_src-db2a40cb3b29bd4a953fe604fdbcbecaf644a92b.zip chromium_src-db2a40cb3b29bd4a953fe604fdbcbecaf644a92b.tar.gz chromium_src-db2a40cb3b29bd4a953fe604fdbcbecaf644a92b.tar.bz2 | |
Use chromeos::CrosLibrary::Get()->EnsureLoaded() to replace chromeos::LoadLibcros()
BUG=crash on start with chromeos touchui
TEST=manually
Review URL: http://codereview.chromium.org/7002005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84936 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/extensions/extension_input_ui_api.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/extensions/extension_input_ui_api.cc b/chrome/browser/extensions/extension_input_ui_api.cc index 11f7c14..4da954b 100644 --- a/chrome/browser/extensions/extension_input_ui_api.cc +++ b/chrome/browser/extensions/extension_input_ui_api.cc @@ -10,6 +10,7 @@ #include "base/logging.h" #include "base/string_util.h" #include "base/values.h" +#include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/extensions/extension_event_router.h" #include "chrome/browser/profiles/profile.h" #include "third_party/cros/chromeos_cros_api.h" @@ -77,8 +78,8 @@ InputUiController::InputUiController( ExtensionInputUiEventRouter* router) : router_(router), ui_status_connection_(NULL) { - std::string error; - chromeos::LoadLibcros(NULL, error); + if (!chromeos::CrosLibrary::Get()->EnsureLoaded()) + return; chromeos::InputMethodUiStatusMonitorFunctions functions; functions.hide_auxiliary_text = @@ -98,7 +99,8 @@ InputUiController::InputUiController( } InputUiController::~InputUiController() { - chromeos::DisconnectInputMethodUiStatus(ui_status_connection_); + if (ui_status_connection_) + chromeos::DisconnectInputMethodUiStatus(ui_status_connection_); } void InputUiController::CandidateClicked( |