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

Unified Diff: chrome/browser/chromeos/input_method/candidate_window_controller_impl.h

Issue 11280159: Remove ibus dependency from PanelService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments Created 8 years 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
Index: chrome/browser/chromeos/input_method/candidate_window_controller_impl.h
diff --git a/chrome/browser/chromeos/input_method/candidate_window_controller_impl.h b/chrome/browser/chromeos/input_method/candidate_window_controller_impl.h
index 741d65b865caa9481fc800f83a81509dfa6c6e7f..402dfd0bba67b1f48ec238836bf8f745fb7c0c25 100644
--- a/chrome/browser/chromeos/input_method/candidate_window_controller_impl.h
+++ b/chrome/browser/chromeos/input_method/candidate_window_controller_impl.h
@@ -10,6 +10,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/observer_list.h"
#include "chrome/browser/chromeos/input_method/candidate_window_view.h"
+#include "chrome/browser/chromeos/input_method/ibus_controller.h"
#include "chrome/browser/chromeos/input_method/infolist_window_view.h"
namespace views {
@@ -25,7 +26,8 @@ class DelayableWidget;
// CandidateWindowController controls the CandidateWindow.
class CandidateWindowControllerImpl : public CandidateWindowController,
public CandidateWindowView::Observer,
- public IBusUiController::Observer {
+ public IBusUiController::Observer,
+ public IBusController::Observer {
public:
CandidateWindowControllerImpl();
virtual ~CandidateWindowControllerImpl();
@@ -87,7 +89,11 @@ class CandidateWindowControllerImpl : public CandidateWindowController,
const InputMethodLookupTable& lookup_table) OVERRIDE;
virtual void OnUpdatePreeditText(const std::string& utf8_text,
unsigned int cursor, bool visible) OVERRIDE;
- virtual void OnConnectionChange(bool connected) OVERRIDE;
+
+ // IBusController::Observer override
+ virtual void PropertyChanged() OVERRIDE;
+ virtual void OnConnected() OVERRIDE;
+ virtual void OnDisconnected() OVERRIDE;
// Updates infolist bounds, if current bounds is up-to-date, this function
// does nothing.

Powered by Google App Engine
This is Rietveld 408576698