Index: chrome/browser/chromeos/input_method/mock_input_method_engine.h |
diff --git a/chrome/browser/chromeos/input_method/mock_input_method_engine.h b/chrome/browser/chromeos/input_method/mock_input_method_engine.h |
index b6ddaaf7983ed59175524121afff199bf6d5dbe1..4926f7e9517fbaab8deece3f2b3509c248f79659 100644 |
--- a/chrome/browser/chromeos/input_method/mock_input_method_engine.h |
+++ b/chrome/browser/chromeos/input_method/mock_input_method_engine.h |
@@ -36,52 +36,52 @@ class MockInputMethodEngine : public InputMethodEngineInterface { |
virtual ~MockInputMethodEngine(); |
// InputMethodEngineInterface overrides. |
- virtual const std::string& GetActiveComponentId() const OVERRIDE; |
+ virtual const std::string& GetActiveComponentId() const override; |
virtual bool SetComposition(int context_id, |
const char* text, |
int selection_start, |
int selection_end, |
int cursor, |
const std::vector<SegmentInfo>& segments, |
- std::string* error) OVERRIDE; |
- virtual bool ClearComposition(int context_id, std::string* error) OVERRIDE; |
+ std::string* error) override; |
+ virtual bool ClearComposition(int context_id, std::string* error) override; |
virtual bool CommitText(int context_id, const char* text, |
- std::string* error) OVERRIDE; |
+ std::string* error) override; |
virtual bool SendKeyEvents(int context_id, |
- const std::vector<KeyboardEvent>& events) OVERRIDE; |
+ const std::vector<KeyboardEvent>& events) override; |
virtual const CandidateWindowProperty& |
- GetCandidateWindowProperty() const OVERRIDE; |
+ GetCandidateWindowProperty() const override; |
virtual void SetCandidateWindowProperty( |
- const CandidateWindowProperty& property) OVERRIDE; |
+ const CandidateWindowProperty& property) override; |
virtual bool SetCandidateWindowVisible(bool visible, |
- std::string* error) OVERRIDE; |
+ std::string* error) override; |
virtual bool SetCandidates(int context_id, |
const std::vector<Candidate>& candidates, |
- std::string* error) OVERRIDE; |
+ std::string* error) override; |
virtual bool SetCursorPosition(int context_id, int candidate_id, |
- std::string* error) OVERRIDE; |
- virtual bool SetMenuItems(const std::vector<MenuItem>& items) OVERRIDE; |
- virtual bool UpdateMenuItems(const std::vector<MenuItem>& items) OVERRIDE; |
- virtual bool IsActive() const OVERRIDE; |
+ std::string* error) override; |
+ virtual bool SetMenuItems(const std::vector<MenuItem>& items) override; |
+ virtual bool UpdateMenuItems(const std::vector<MenuItem>& items) override; |
+ virtual bool IsActive() const override; |
virtual bool DeleteSurroundingText(int context_id, |
int offset, |
size_t number_of_chars, |
- std::string* error) OVERRIDE; |
+ std::string* error) override; |
// IMEEngineHandlerInterface overrides. |
virtual void FocusIn( |
- const IMEEngineHandlerInterface::InputContext& input_context) OVERRIDE; |
- virtual void FocusOut() OVERRIDE; |
- virtual void Enable(const std::string& component_id) OVERRIDE; |
- virtual void Disable() OVERRIDE; |
- virtual void PropertyActivate(const std::string& property_name) OVERRIDE; |
- virtual void Reset() OVERRIDE; |
+ const IMEEngineHandlerInterface::InputContext& input_context) override; |
+ virtual void FocusOut() override; |
+ virtual void Enable(const std::string& component_id) override; |
+ virtual void Disable() override; |
+ virtual void PropertyActivate(const std::string& property_name) override; |
+ virtual void Reset() override; |
virtual void ProcessKeyEvent(const ui::KeyEvent& key_event, |
- const KeyEventDoneCallback& callback) OVERRIDE; |
- virtual void CandidateClicked(uint32 index) OVERRIDE; |
+ const KeyEventDoneCallback& callback) override; |
+ virtual void CandidateClicked(uint32 index) override; |
virtual void SetSurroundingText(const std::string& text, uint32 cursor_pos, |
- uint32 anchor_pos) OVERRIDE; |
- virtual void HideInputView() OVERRIDE; |
+ uint32 anchor_pos) override; |
+ virtual void HideInputView() override; |
std::string last_activated_property() const { |
return last_activated_property_; |