Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(486)

Unified Diff: chrome/browser/chromeos/input_method/ibus_controller_impl.cc

Issue 12223084: Fix crash around Reset function call. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressing comment Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/input_method/ibus_controller_impl.cc
diff --git a/chrome/browser/chromeos/input_method/ibus_controller_impl.cc b/chrome/browser/chromeos/input_method/ibus_controller_impl.cc
index 13e4f947d64f411e195475ebbbb97605e0c3ca36..7a2d7cf10e44ce26e5212a0433963b75d58c0c7f 100644
--- a/chrome/browser/chromeos/input_method/ibus_controller_impl.cc
+++ b/chrome/browser/chromeos/input_method/ibus_controller_impl.cc
@@ -246,7 +246,9 @@ void IBusControllerImpl::Reset() {
return;
IBusInputContextClient* client
= DBusThreadManager::Get()->GetIBusInputContextClient();
- if (client)
+ // We don't need to call Reset if there is no on-going input context, because
+ // the input context will be reset at initialization.
+ if (client && client->IsObjectProxyReady())
client->Reset();
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698