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

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

Issue 11783053: Clean Up: Remove ibus namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 11 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
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 78b357489f3a9554aac9859634e3839ac735ef6a..d79b096e90013a1ead8641b29e7bacc041822a02 100644
--- a/chrome/browser/chromeos/input_method/candidate_window_controller_impl.h
+++ b/chrome/browser/chromeos/input_method/candidate_window_controller_impl.h
@@ -19,10 +19,8 @@ class Widget;
} // namespace views
namespace chromeos {
-// TODO(nona): remove ibus namespace
-namespace ibus {
class IBusLookupTable;
-} // namespace ibus
+
namespace input_method {
class DelayableWidget;
@@ -32,7 +30,7 @@ class DelayableWidget;
class CandidateWindowControllerImpl
: public CandidateWindowController,
public CandidateWindowView::Observer,
- public ibus::IBusPanelCandidateWindowHandlerInterface,
+ public IBusPanelCandidateWindowHandlerInterface,
public IBusController::Observer {
public:
CandidateWindowControllerImpl();
@@ -62,7 +60,7 @@ class CandidateWindowControllerImpl
// Converts |lookup_table| to infolist entries. |focused_index| become
// InfolistWindowView::InvalidFocusIndex if there is no selected entries.
static void ConvertLookupTableToInfolistEntry(
- const ibus::IBusLookupTable& lookup_table,
+ const IBusLookupTable& lookup_table,
std::vector<InfolistWindowView::Entry>* infolist_entries,
size_t* focused_index);
@@ -83,7 +81,7 @@ class CandidateWindowControllerImpl
// Creates the candidate window view.
void CreateView();
- // ibus::IBusPanelCandidateWindowHandlerInterface overrides.
+ // IBusPanelCandidateWindowHandlerInterface overrides.
virtual void HideAuxiliaryText() OVERRIDE;
virtual void HideLookupTable() OVERRIDE;
virtual void HidePreeditText() OVERRIDE;
@@ -91,7 +89,7 @@ class CandidateWindowControllerImpl
const ibus::Rect& composition_head) OVERRIDE;
virtual void UpdateAuxiliaryText(const std::string& utf8_text,
bool visible) OVERRIDE;
- virtual void UpdateLookupTable(const ibus::IBusLookupTable& lookup_table,
+ virtual void UpdateLookupTable(const IBusLookupTable& lookup_table,
bool visible) OVERRIDE;
virtual void UpdatePreeditText(const std::string& utf8_text,
unsigned int cursor, bool visible) OVERRIDE;

Powered by Google App Engine
This is Rietveld 408576698