From 0ca00fca3257ba08cd7f3e37bd4708ebd064c0b6 Mon Sep 17 00:00:00 2001 From: "nona@chromium.org" Date: Wed, 13 Feb 2013 02:54:57 +0000 Subject: 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 --- chromeos/ime/ibus_bridge.cc | 2 -- chromeos/ime/ibus_bridge.h | 7 ++++--- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'chromeos') 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 #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. -- cgit v1.1