diff options
| author | nona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-13 02:54:57 +0000 |
|---|---|---|
| committer | nona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-13 02:54:57 +0000 |
| commit | 0ca00fca3257ba08cd7f3e37bd4708ebd064c0b6 (patch) | |
| tree | 51a26261d000571d7ab626453b38b5f04d878af7 /chromeos | |
| parent | bd8b0cb3956f7098ef5d287bf220691615d8a894 (diff) | |
| download | chromium_src-0ca00fca3257ba08cd7f3e37bd4708ebd064c0b6.zip chromium_src-0ca00fca3257ba08cd7f3e37bd4708ebd064c0b6.tar.gz chromium_src-0ca00fca3257ba08cd7f3e37bd4708ebd064c0b6.tar.bz2 | |
Calling IBusBridge::Initialize/Shutdown function.
Initialize/Shutdown IBusBridge on input method initialization/shutting down.
IBusBridge is only used for ChromeOS-Chrome on Desktop Linux.
BUG=170671
TEST=try bots.
Review URL: https://chromiumcodereview.appspot.com/12221045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182098 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos')
| -rw-r--r-- | chromeos/ime/ibus_bridge.cc | 2 | ||||
| -rw-r--r-- | chromeos/ime/ibus_bridge.h | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/chromeos/ime/ibus_bridge.cc b/chromeos/ime/ibus_bridge.cc index 52b5423..691ff89 100644 --- a/chromeos/ime/ibus_bridge.cc +++ b/chromeos/ime/ibus_bridge.cc @@ -99,8 +99,6 @@ void IBusBridge::Shutdown() { // static. IBusBridge* IBusBridge::Get() { - CHECK(g_ibus_bridge) - << "IBusBrige::Get() called before Initialized() or after Shutdown()."; return g_ibus_bridge; } diff --git a/chromeos/ime/ibus_bridge.h b/chromeos/ime/ibus_bridge.h index 075bcd0..af51eb8 100644 --- a/chromeos/ime/ibus_bridge.h +++ b/chromeos/ime/ibus_bridge.h @@ -7,6 +7,7 @@ #include <string> #include "base/basictypes.h" +#include "chromeos/chromeos_export.h" namespace chromeos { class IBusInputContextHandlerInterface; @@ -24,13 +25,13 @@ class IBusBridge { virtual ~IBusBridge(); // Allocates the global instance. Must be called before any calls to Get(). - static void Initialize(); + static CHROMEOS_EXPORT void Initialize(); // Releases the global instance. - static void Shutdown(); + static CHROMEOS_EXPORT void Shutdown(); // Returns IBusBridge global instance. Initialize() must be called first. - static IBusBridge* Get(); + static CHROMEOS_EXPORT IBusBridge* Get(); // Returns current InputContextHandler. This function returns NULL if input // context is not ready to use. |