diff options
Diffstat (limited to 'chrome/browser/chromeos/input_method')
20 files changed, 182 insertions, 182 deletions
diff --git a/chrome/browser/chromeos/input_method/accessibility.h b/chrome/browser/chromeos/input_method/accessibility.h index 60fb084..8206d33 100644 --- a/chrome/browser/chromeos/input_method/accessibility.h +++ b/chrome/browser/chromeos/input_method/accessibility.h @@ -20,7 +20,7 @@ class Accessibility private: // InputMethodManager::Observer implementation. virtual void InputMethodChanged(InputMethodManager* imm, - bool show_message) OVERRIDE; + bool show_message) override; InputMethodManager* imm_; DISALLOW_COPY_AND_ASSIGN(Accessibility); diff --git a/chrome/browser/chromeos/input_method/browser_state_monitor.h b/chrome/browser/chromeos/input_method/browser_state_monitor.h index 04f0aa8..9907e4c 100644 --- a/chrome/browser/chromeos/input_method/browser_state_monitor.h +++ b/chrome/browser/chromeos/input_method/browser_state_monitor.h @@ -33,7 +33,7 @@ class BrowserStateMonitor : public content::NotificationObserver { // content::NotificationObserver overrides: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; private: base::Callback<void(InputMethodManager::UISessionState)> observer_; 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 8a40b03..285b6c2 100644 --- a/chrome/browser/chromeos/input_method/candidate_window_controller_impl.h +++ b/chrome/browser/chromeos/input_method/candidate_window_controller_impl.h @@ -47,10 +47,10 @@ class CandidateWindowControllerImpl // CandidateWindowController overrides: virtual void AddObserver( - CandidateWindowController::Observer* observer) OVERRIDE; + CandidateWindowController::Observer* observer) override; virtual void RemoveObserver( - CandidateWindowController::Observer* observer) OVERRIDE; - virtual void Hide() OVERRIDE; + CandidateWindowController::Observer* observer) override; + virtual void Hide() override; protected: static void ConvertLookupTableToInfolistEntry( @@ -60,20 +60,20 @@ class CandidateWindowControllerImpl private: // ash::ime::CandidateWindowView::Observer implementation. - virtual void OnCandidateCommitted(int index) OVERRIDE; + virtual void OnCandidateCommitted(int index) override; // views::WidgetObserver implementation. - virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE; + virtual void OnWidgetClosing(views::Widget* widget) override; // IMECandidateWindowHandlerInterface implementation. virtual void SetCursorBounds(const gfx::Rect& cursor_bounds, - const gfx::Rect& composition_head) OVERRIDE; + const gfx::Rect& composition_head) override; virtual void UpdateLookupTable( const ui::CandidateWindow& candidate_window, - bool visible) OVERRIDE; + bool visible) override; virtual void UpdatePreeditText(const base::string16& text, - unsigned int cursor, bool visible) OVERRIDE; - virtual void FocusStateChanged(bool is_focused) OVERRIDE; + unsigned int cursor, bool visible) override; + virtual void FocusStateChanged(bool is_focused) override; void InitCandidateWindowView(); diff --git a/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.h b/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.h index ab326a4..453c9ef 100644 --- a/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.h +++ b/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.h @@ -27,14 +27,14 @@ class ComponentExtensionIMEManagerImpl virtual ~ComponentExtensionIMEManagerImpl(); // ComponentExtensionIMEManagerDelegate overrides: - virtual std::vector<ComponentExtensionIME> ListIME() OVERRIDE; + virtual std::vector<ComponentExtensionIME> ListIME() override; virtual void Load(Profile* profile, const std::string& extension_id, const std::string& manifest, - const base::FilePath& file_path) OVERRIDE; + const base::FilePath& file_path) override; virtual void Unload(Profile* profile, const std::string& extension_id, - const base::FilePath& file_path) OVERRIDE; + const base::FilePath& file_path) override; private: // Reads component extensions and extract their localized information: name, diff --git a/chrome/browser/chromeos/input_method/input_method_delegate_impl.h b/chrome/browser/chromeos/input_method/input_method_delegate_impl.h index 556aad2..c08d7c3 100644 --- a/chrome/browser/chromeos/input_method/input_method_delegate_impl.h +++ b/chrome/browser/chromeos/input_method/input_method_delegate_impl.h @@ -22,12 +22,12 @@ class InputMethodDelegateImpl : public InputMethodDelegate { virtual ~InputMethodDelegateImpl(); // InputMethodDelegate implementation. - virtual std::string GetHardwareKeyboardLayouts() const OVERRIDE; - virtual base::string16 GetLocalizedString(int resource_id) const OVERRIDE; + virtual std::string GetHardwareKeyboardLayouts() const override; + virtual base::string16 GetLocalizedString(int resource_id) const override; virtual base::string16 GetDisplayLanguageName( - const std::string& language_code) const OVERRIDE; + const std::string& language_code) const override; virtual void SetHardwareKeyboardLayoutForTesting( - const std::string& layout) OVERRIDE; + const std::string& layout) override; private: DISALLOW_COPY_AND_ASSIGN(InputMethodDelegateImpl); diff --git a/chrome/browser/chromeos/input_method/input_method_engine.h b/chrome/browser/chromeos/input_method/input_method_engine.h index 671d09e..101c22d 100644 --- a/chrome/browser/chromeos/input_method/input_method_engine.h +++ b/chrome/browser/chromeos/input_method/input_method_engine.h @@ -44,52 +44,52 @@ class InputMethodEngine : public InputMethodEngineInterface { const char* extension_id); // 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; int GetCotextIdForTesting() { return context_id_; } diff --git a/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc b/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc index d2ce436..cc4b628 100644 --- a/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc +++ b/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc @@ -50,11 +50,11 @@ class InputMethodEngineBrowserTest : ExtensionBrowserTest() {} virtual ~InputMethodEngineBrowserTest() {} - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { ExtensionBrowserTest::SetUpInProcessBrowserTestFixture(); } - virtual void TearDownInProcessBrowserTestFixture() OVERRIDE { + virtual void TearDownInProcessBrowserTestFixture() override { extension_ = NULL; } diff --git a/chrome/browser/chromeos/input_method/input_method_engine_unittest.cc b/chrome/browser/chromeos/input_method/input_method_engine_unittest.cc index 5863571..1edbbf0 100644 --- a/chrome/browser/chromeos/input_method/input_method_engine_unittest.cc +++ b/chrome/browser/chromeos/input_method/input_method_engine_unittest.cc @@ -65,38 +65,38 @@ class TestObserver : public InputMethodEngineInterface::Observer { TestObserver() : calls_bitmap_(NONE) {} virtual ~TestObserver() {} - virtual void OnActivate(const std::string& engine_id) OVERRIDE { + virtual void OnActivate(const std::string& engine_id) override { calls_bitmap_ |= ACTIVATE; } - virtual void OnDeactivated(const std::string& engine_id) OVERRIDE { + virtual void OnDeactivated(const std::string& engine_id) override { calls_bitmap_ |= DEACTIVATED; } virtual void OnFocus( - const InputMethodEngineInterface::InputContext& context) OVERRIDE { + const InputMethodEngineInterface::InputContext& context) override { calls_bitmap_ |= ONFOCUS; } - virtual void OnBlur(int context_id) OVERRIDE { + virtual void OnBlur(int context_id) override { calls_bitmap_ |= ONBLUR; } virtual void OnKeyEvent( const std::string& engine_id, const InputMethodEngineInterface::KeyboardEvent& event, - input_method::KeyEventHandle* key_data) OVERRIDE {} + input_method::KeyEventHandle* key_data) override {} virtual void OnInputContextUpdate( - const InputMethodEngineInterface::InputContext& context) OVERRIDE {} + const InputMethodEngineInterface::InputContext& context) override {} virtual void OnCandidateClicked( const std::string& engine_id, int candidate_id, - InputMethodEngineInterface::MouseButtonEvent button) OVERRIDE {} + InputMethodEngineInterface::MouseButtonEvent button) override {} virtual void OnMenuItemActivated( const std::string& engine_id, - const std::string& menu_id) OVERRIDE {} + const std::string& menu_id) override {} virtual void OnSurroundingTextChanged( const std::string& engine_id, const std::string& text, int cursor_pos, - int anchor_pos) OVERRIDE {} - virtual void OnReset(const std::string& engine_id) OVERRIDE {} + int anchor_pos) override {} + virtual void OnReset(const std::string& engine_id) override {} unsigned char GetCallsBitmapAndReset() { unsigned char ret = calls_bitmap_; diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl.h b/chrome/browser/chromeos/input_method/input_method_manager_impl.h index 8864000..6ccc24f 100644 --- a/chrome/browser/chromeos/input_method/input_method_manager_impl.h +++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.h @@ -62,43 +62,43 @@ class InputMethodManagerImpl : public InputMethodManager, bool MethodAwaitsExtensionLoad(const std::string& input_method_id) const; // InputMethodManager::State overrides. - virtual scoped_refptr<InputMethodManager::State> Clone() const OVERRIDE; + virtual scoped_refptr<InputMethodManager::State> Clone() const override; virtual void AddInputMethodExtension( const std::string& extension_id, const InputMethodDescriptors& descriptors, - InputMethodEngineInterface* instance) OVERRIDE; + InputMethodEngineInterface* instance) override; virtual void RemoveInputMethodExtension( - const std::string& extension_id) OVERRIDE; + const std::string& extension_id) override; virtual void ChangeInputMethod(const std::string& input_method_id, - bool show_message) OVERRIDE; + bool show_message) override; virtual bool EnableInputMethod( - const std::string& new_active_input_method_id) OVERRIDE; + const std::string& new_active_input_method_id) override; virtual void EnableLoginLayouts( const std::string& language_code, - const std::vector<std::string>& initial_layouts) OVERRIDE; - virtual void EnableLockScreenLayouts() OVERRIDE; + const std::vector<std::string>& initial_layouts) override; + virtual void EnableLockScreenLayouts() override; virtual void GetInputMethodExtensions( - InputMethodDescriptors* result) OVERRIDE; + InputMethodDescriptors* result) override; virtual scoped_ptr<InputMethodDescriptors> GetActiveInputMethods() - const OVERRIDE; + const override; virtual const std::vector<std::string>& GetActiveInputMethodIds() - const OVERRIDE; + const override; virtual const InputMethodDescriptor* GetInputMethodFromId( - const std::string& input_method_id) const OVERRIDE; - virtual size_t GetNumActiveInputMethods() const OVERRIDE; + const std::string& input_method_id) const override; + virtual size_t GetNumActiveInputMethods() const override; virtual void SetEnabledExtensionImes( - std::vector<std::string>* ids) OVERRIDE; - virtual void SetInputMethodLoginDefault() OVERRIDE; + std::vector<std::string>* ids) override; + virtual void SetInputMethodLoginDefault() override; virtual void SetInputMethodLoginDefaultFromVPD( const std::string& locale, - const std::string& layout) OVERRIDE; - virtual bool SwitchToNextInputMethod() OVERRIDE; + const std::string& layout) override; + virtual bool SwitchToNextInputMethod() override; virtual bool SwitchToPreviousInputMethod( - const ui::Accelerator& accelerator) OVERRIDE; - virtual bool SwitchInputMethod(const ui::Accelerator& accelerator) OVERRIDE; - virtual InputMethodDescriptor GetCurrentInputMethod() const OVERRIDE; + const ui::Accelerator& accelerator) override; + virtual bool SwitchInputMethod(const ui::Accelerator& accelerator) override; + virtual InputMethodDescriptor GetCurrentInputMethod() const override; virtual bool ReplaceEnabledInputMethods( - const std::vector<std::string>& new_active_input_method_ids) OVERRIDE; + const std::vector<std::string>& new_active_input_method_ids) override; // ------------------------- Data members. Profile* const profile; @@ -139,34 +139,34 @@ class InputMethodManagerImpl : public InputMethodManager, void SetUISessionState(UISessionState new_ui_session); // InputMethodManager override: - virtual UISessionState GetUISessionState() OVERRIDE; - virtual void AddObserver(InputMethodManager::Observer* observer) OVERRIDE; + virtual UISessionState GetUISessionState() override; + virtual void AddObserver(InputMethodManager::Observer* observer) override; virtual void AddCandidateWindowObserver( - InputMethodManager::CandidateWindowObserver* observer) OVERRIDE; - virtual void RemoveObserver(InputMethodManager::Observer* observer) OVERRIDE; + InputMethodManager::CandidateWindowObserver* observer) override; + virtual void RemoveObserver(InputMethodManager::Observer* observer) override; virtual void RemoveCandidateWindowObserver( - InputMethodManager::CandidateWindowObserver* observer) OVERRIDE; + InputMethodManager::CandidateWindowObserver* observer) override; virtual scoped_ptr<InputMethodDescriptors> - GetSupportedInputMethods() const OVERRIDE; - virtual void ActivateInputMethodMenuItem(const std::string& key) OVERRIDE; - virtual bool IsISOLevel5ShiftUsedByCurrentInputMethod() const OVERRIDE; - virtual bool IsAltGrUsedByCurrentInputMethod() const OVERRIDE; + GetSupportedInputMethods() const override; + virtual void ActivateInputMethodMenuItem(const std::string& key) override; + virtual bool IsISOLevel5ShiftUsedByCurrentInputMethod() const override; + virtual bool IsAltGrUsedByCurrentInputMethod() const override; - virtual ImeKeyboard* GetImeKeyboard() OVERRIDE; - virtual InputMethodUtil* GetInputMethodUtil() OVERRIDE; + virtual ImeKeyboard* GetImeKeyboard() override; + virtual InputMethodUtil* GetInputMethodUtil() override; virtual ComponentExtensionIMEManager* - GetComponentExtensionIMEManager() OVERRIDE; - virtual bool IsLoginKeyboard(const std::string& layout) const OVERRIDE; + GetComponentExtensionIMEManager() override; + virtual bool IsLoginKeyboard(const std::string& layout) const override; virtual bool MigrateInputMethods( - std::vector<std::string>* input_method_ids) OVERRIDE; + std::vector<std::string>* input_method_ids) override; virtual scoped_refptr<InputMethodManager::State> CreateNewState( - Profile* profile) OVERRIDE; + Profile* profile) override; - virtual scoped_refptr<InputMethodManager::State> GetActiveIMEState() OVERRIDE; + virtual scoped_refptr<InputMethodManager::State> GetActiveIMEState() override; virtual void SetState( - scoped_refptr<InputMethodManager::State> state) OVERRIDE; + scoped_refptr<InputMethodManager::State> state) override; // Sets |candidate_window_controller_|. void SetCandidateWindowControllerForTesting( @@ -181,9 +181,9 @@ class InputMethodManagerImpl : public InputMethodManager, friend class InputMethodManagerImplTest; // CandidateWindowController::Observer overrides: - virtual void CandidateClicked(int index) OVERRIDE; - virtual void CandidateWindowOpened() OVERRIDE; - virtual void CandidateWindowClosed() OVERRIDE; + virtual void CandidateClicked(int index) override; + virtual void CandidateWindowOpened() override; + virtual void CandidateWindowClosed() override; // Temporarily deactivates all input methods (e.g. Chinese, Japanese, Arabic) // since they are not necessary to input a login password. Users are still diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc b/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc index d58c838..498a0c1 100644 --- a/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc +++ b/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc @@ -71,12 +71,12 @@ class TestObserver : public InputMethodManager::Observer, virtual ~TestObserver() {} virtual void InputMethodChanged(InputMethodManager* manager, - bool show_message) OVERRIDE { + bool show_message) override { ++input_method_changed_count_; last_show_message_ = show_message; } virtual void InputMethodMenuItemChanged( - ash::ime::InputMethodMenuManager* manager) OVERRIDE { + ash::ime::InputMethodMenuManager* manager) override { ++input_method_menu_item_changed_count_; } @@ -98,10 +98,10 @@ class TestCandidateWindowObserver virtual ~TestCandidateWindowObserver() {} - virtual void CandidateWindowOpened(InputMethodManager* manager) OVERRIDE { + virtual void CandidateWindowOpened(InputMethodManager* manager) override { ++candidate_window_opened_count_; } - virtual void CandidateWindowClosed(InputMethodManager* manager) OVERRIDE { + virtual void CandidateWindowClosed(InputMethodManager* manager) override { ++candidate_window_closed_count_; } @@ -122,7 +122,7 @@ class InputMethodManagerImplTest : public BrowserWithTestWindowTest { } virtual ~InputMethodManagerImplTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { profile_manager_.reset(new TestingProfileManager(GetBrowserProcess())); ASSERT_TRUE(profile_manager_->SetUp()); @@ -148,7 +148,7 @@ class InputMethodManagerImplTest : public BrowserWithTestWindowTest { BrowserWithTestWindowTest::SetUp(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { BrowserWithTestWindowTest::TearDown(); ui::ShutdownInputMethodForTesting(); diff --git a/chrome/browser/chromeos/input_method/input_method_persistence.h b/chrome/browser/chromeos/input_method/input_method_persistence.h index a9fe28c..c477c03 100644 --- a/chrome/browser/chromeos/input_method/input_method_persistence.h +++ b/chrome/browser/chromeos/input_method/input_method_persistence.h @@ -33,7 +33,7 @@ class InputMethodPersistence : public InputMethodManager::Observer { // InputMethodManager::Observer overrides. virtual void InputMethodChanged(InputMethodManager* manager, - bool show_message) OVERRIDE; + bool show_message) override; private: InputMethodManager* input_method_manager_; diff --git a/chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc b/chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc index da06153..1bb456d 100644 --- a/chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc +++ b/chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc @@ -38,7 +38,7 @@ class InputMethodPersistenceTest : public testing::Test { fake_user_manager_(new chromeos::FakeUserManager()), user_manager_enabler_(fake_user_manager_) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(mock_profile_manager_.SetUp()); // Add a user. diff --git a/chrome/browser/chromeos/input_method/input_method_util_unittest.cc b/chrome/browser/chromeos/input_method/input_method_util_unittest.cc index 0f117a8..0e06cbb 100644 --- a/chrome/browser/chromeos/input_method/input_method_util_unittest.cc +++ b/chrome/browser/chromeos/input_method/input_method_util_unittest.cc @@ -53,7 +53,7 @@ class InputMethodUtilTest : public testing::Test { base::Bind(&InputMethodUtilTest::GetDisplayLanguageName)); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { InputMethodDescriptors input_methods; std::vector<std::string> layouts; diff --git a/chrome/browser/chromeos/input_method/mock_candidate_window_controller.h b/chrome/browser/chromeos/input_method/mock_candidate_window_controller.h index 0cb1fdf..71d6620 100644 --- a/chrome/browser/chromeos/input_method/mock_candidate_window_controller.h +++ b/chrome/browser/chromeos/input_method/mock_candidate_window_controller.h @@ -19,9 +19,9 @@ class MockCandidateWindowController : public CandidateWindowController { virtual ~MockCandidateWindowController(); // CandidateWindowController overrides: - virtual void AddObserver(Observer* observer) OVERRIDE; - virtual void RemoveObserver(Observer* observer) OVERRIDE; - virtual void Hide() OVERRIDE; + virtual void AddObserver(Observer* observer) override; + virtual void RemoveObserver(Observer* observer) override; + virtual void Hide() override; // Notifies observers. void NotifyCandidateWindowOpened(); 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 b6ddaaf..4926f7e 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_; diff --git a/chrome/browser/chromeos/input_method/mock_input_method_manager.h b/chrome/browser/chromeos/input_method/mock_input_method_manager.h index 2830a3e..76b7c22 100644 --- a/chrome/browser/chromeos/input_method/mock_input_method_manager.h +++ b/chrome/browser/chromeos/input_method/mock_input_method_manager.h @@ -22,43 +22,43 @@ class MockInputMethodManager : public InputMethodManager { public: explicit State(MockInputMethodManager* manager); - virtual scoped_refptr<InputMethodManager::State> Clone() const OVERRIDE; + virtual scoped_refptr<InputMethodManager::State> Clone() const override; virtual void AddInputMethodExtension( const std::string& extension_id, const InputMethodDescriptors& descriptors, - InputMethodEngineInterface* instance) OVERRIDE; + InputMethodEngineInterface* instance) override; virtual void RemoveInputMethodExtension( - const std::string& extension_id) OVERRIDE; + const std::string& extension_id) override; virtual void ChangeInputMethod(const std::string& input_method_id, - bool show_message) OVERRIDE; + bool show_message) override; virtual bool EnableInputMethod( - const std::string& new_active_input_method_id) OVERRIDE; + const std::string& new_active_input_method_id) override; virtual void EnableLoginLayouts( const std::string& language_code, - const std::vector<std::string>& initial_layouts) OVERRIDE; - virtual void EnableLockScreenLayouts() OVERRIDE; + const std::vector<std::string>& initial_layouts) override; + virtual void EnableLockScreenLayouts() override; virtual void GetInputMethodExtensions( - InputMethodDescriptors* result) OVERRIDE; + InputMethodDescriptors* result) override; virtual scoped_ptr<InputMethodDescriptors> GetActiveInputMethods() - const OVERRIDE; + const override; virtual const std::vector<std::string>& GetActiveInputMethodIds() - const OVERRIDE; + const override; virtual const InputMethodDescriptor* GetInputMethodFromId( - const std::string& input_method_id) const OVERRIDE; - virtual size_t GetNumActiveInputMethods() const OVERRIDE; + const std::string& input_method_id) const override; + virtual size_t GetNumActiveInputMethods() const override; virtual void SetEnabledExtensionImes( - std::vector<std::string>* ids) OVERRIDE; - virtual void SetInputMethodLoginDefault() OVERRIDE; + std::vector<std::string>* ids) override; + virtual void SetInputMethodLoginDefault() override; virtual void SetInputMethodLoginDefaultFromVPD( const std::string& locale, - const std::string& layout) OVERRIDE; - virtual bool SwitchToNextInputMethod() OVERRIDE; + const std::string& layout) override; + virtual bool SwitchToNextInputMethod() override; virtual bool SwitchToPreviousInputMethod( - const ui::Accelerator& accelerator) OVERRIDE; - virtual bool SwitchInputMethod(const ui::Accelerator& accelerator) OVERRIDE; - virtual InputMethodDescriptor GetCurrentInputMethod() const OVERRIDE; + const ui::Accelerator& accelerator) override; + virtual bool SwitchInputMethod(const ui::Accelerator& accelerator) override; + virtual InputMethodDescriptor GetCurrentInputMethod() const override; virtual bool ReplaceEnabledInputMethods( - const std::vector<std::string>& new_active_input_method_ids) OVERRIDE; + const std::vector<std::string>& new_active_input_method_ids) override; // The value GetCurrentInputMethod().id() will return. std::string current_input_method_id; @@ -77,30 +77,30 @@ class MockInputMethodManager : public InputMethodManager { virtual ~MockInputMethodManager(); // InputMethodManager override: - virtual UISessionState GetUISessionState() OVERRIDE; - virtual void AddObserver(InputMethodManager::Observer* observer) OVERRIDE; + virtual UISessionState GetUISessionState() override; + virtual void AddObserver(InputMethodManager::Observer* observer) override; virtual void AddCandidateWindowObserver( - InputMethodManager::CandidateWindowObserver* observer) OVERRIDE; - virtual void RemoveObserver(InputMethodManager::Observer* observer) OVERRIDE; + InputMethodManager::CandidateWindowObserver* observer) override; + virtual void RemoveObserver(InputMethodManager::Observer* observer) override; virtual void RemoveCandidateWindowObserver( - InputMethodManager::CandidateWindowObserver* observer) OVERRIDE; + InputMethodManager::CandidateWindowObserver* observer) override; virtual scoped_ptr<InputMethodDescriptors> - GetSupportedInputMethods() const OVERRIDE; - virtual void ActivateInputMethodMenuItem(const std::string& key) OVERRIDE; - virtual bool IsISOLevel5ShiftUsedByCurrentInputMethod() const OVERRIDE; - virtual bool IsAltGrUsedByCurrentInputMethod() const OVERRIDE; - virtual ImeKeyboard* GetImeKeyboard() OVERRIDE; - virtual InputMethodUtil* GetInputMethodUtil() OVERRIDE; + GetSupportedInputMethods() const override; + virtual void ActivateInputMethodMenuItem(const std::string& key) override; + virtual bool IsISOLevel5ShiftUsedByCurrentInputMethod() const override; + virtual bool IsAltGrUsedByCurrentInputMethod() const override; + virtual ImeKeyboard* GetImeKeyboard() override; + virtual InputMethodUtil* GetInputMethodUtil() override; virtual ComponentExtensionIMEManager* - GetComponentExtensionIMEManager() OVERRIDE; - virtual bool IsLoginKeyboard(const std::string& layout) const OVERRIDE; + GetComponentExtensionIMEManager() override; + virtual bool IsLoginKeyboard(const std::string& layout) const override; virtual bool MigrateInputMethods( - std::vector<std::string>* input_method_ids) OVERRIDE; + std::vector<std::string>* input_method_ids) override; virtual scoped_refptr<InputMethodManager::State> CreateNewState( - Profile* profile) OVERRIDE; - virtual scoped_refptr<InputMethodManager::State> GetActiveIMEState() OVERRIDE; + Profile* profile) override; + virtual scoped_refptr<InputMethodManager::State> GetActiveIMEState() override; virtual void SetState( - scoped_refptr<InputMethodManager::State> state) OVERRIDE; + scoped_refptr<InputMethodManager::State> state) override; // Sets an input method ID which will be returned by GetCurrentInputMethod(). void SetCurrentInputMethodId(const std::string& input_method_id); diff --git a/chrome/browser/chromeos/input_method/mode_indicator_browsertest.cc b/chrome/browser/chromeos/input_method/mode_indicator_browsertest.cc index 5731558..92fbb52 100644 --- a/chrome/browser/chromeos/input_method/mode_indicator_browsertest.cc +++ b/chrome/browser/chromeos/input_method/mode_indicator_browsertest.cc @@ -59,7 +59,7 @@ class ScopedModeIndicatorObserverForTesting : } // ModeIndicatorObserverInterface override: - virtual void AddModeIndicatorWidget(views::Widget* widget) OVERRIDE { + virtual void AddModeIndicatorWidget(views::Widget* widget) override { widget_list_.push_back(widget); max_widget_list_size_ = std::max(max_widget_list_size_, widget_list_.size()); @@ -67,7 +67,7 @@ class ScopedModeIndicatorObserverForTesting : } // views::WidgetObserver override: - virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE { + virtual void OnWidgetDestroying(views::Widget* widget) override { std::vector<views::Widget*>::iterator it = std::find(widget_list_.begin(), widget_list_.end(), widget); if (it != widget_list_.end()) @@ -76,7 +76,7 @@ class ScopedModeIndicatorObserverForTesting : // views::WidgetObserver override: virtual void OnWidgetVisibilityChanged(views::Widget* widget, - bool visible) OVERRIDE { + bool visible) override { last_bounds_ = widget->GetWindowBoundsInScreen(); is_displayed_ |= visible; } @@ -94,7 +94,7 @@ class ModeIndicatorBrowserTest : public InProcessBrowserTest { : InProcessBrowserTest() {} virtual ~ModeIndicatorBrowserTest() {} - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { ui::SetUpInputMethodFactoryForTesting(); } diff --git a/chrome/browser/chromeos/input_method/mode_indicator_controller.cc b/chrome/browser/chromeos/input_method/mode_indicator_controller.cc index 30bcc4e..3354ccf 100644 --- a/chrome/browser/chromeos/input_method/mode_indicator_controller.cc +++ b/chrome/browser/chromeos/input_method/mode_indicator_controller.cc @@ -31,7 +31,7 @@ class ModeIndicatorObserver : public ModeIndicatorObserverInterface { // If other active mode indicator widget is shown, close it immedicately // without fading animation. Then store this widget as the active widget. - virtual void AddModeIndicatorWidget(views::Widget* widget) OVERRIDE { + virtual void AddModeIndicatorWidget(views::Widget* widget) override { DCHECK(widget); if (active_widget_) active_widget_->Close(); @@ -40,7 +40,7 @@ class ModeIndicatorObserver : public ModeIndicatorObserverInterface { } // views::WidgetObserver override: - virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE { + virtual void OnWidgetDestroying(views::Widget* widget) override { if (widget == active_widget_) active_widget_ = NULL; } diff --git a/chrome/browser/chromeos/input_method/mode_indicator_controller.h b/chrome/browser/chromeos/input_method/mode_indicator_controller.h index 9023c6c..502ff5a 100644 --- a/chrome/browser/chromeos/input_method/mode_indicator_controller.h +++ b/chrome/browser/chromeos/input_method/mode_indicator_controller.h @@ -47,7 +47,7 @@ class ModeIndicatorController private: // InputMethodManager::Observer implementation. virtual void InputMethodChanged(InputMethodManager* manager, - bool show_message) OVERRIDE; + bool show_message) override; // Show the mode inidicator with the current ime's short name if all // the conditions are cleared. diff --git a/chrome/browser/chromeos/input_method/textinput_test_helper.h b/chrome/browser/chromeos/input_method/textinput_test_helper.h index 2b97425..7fdafcb 100644 --- a/chrome/browser/chromeos/input_method/textinput_test_helper.h +++ b/chrome/browser/chromeos/input_method/textinput_test_helper.h @@ -23,7 +23,7 @@ class TextInputTestBase : public InProcessBrowserTest { TextInputTestBase() {} virtual ~TextInputTestBase() {} - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE; + virtual void SetUpInProcessBrowserTestFixture() override; private: DISALLOW_COPY_AND_ASSIGN(TextInputTestBase); }; @@ -72,15 +72,15 @@ class TextInputTestHelper : public ui::InputMethodObserver { // ui::InputMethodObserver overrides. virtual void OnTextInputTypeChanged( - const ui::TextInputClient* client) OVERRIDE; - virtual void OnFocus() OVERRIDE; - virtual void OnBlur() OVERRIDE; - virtual void OnCaretBoundsChanged(const ui::TextInputClient* client) OVERRIDE; + const ui::TextInputClient* client) override; + virtual void OnFocus() override; + virtual void OnBlur() override; + virtual void OnCaretBoundsChanged(const ui::TextInputClient* client) override; virtual void OnTextInputStateChanged( - const ui::TextInputClient* client) OVERRIDE; - virtual void OnShowImeIfNeeded() OVERRIDE; + const ui::TextInputClient* client) override; + virtual void OnShowImeIfNeeded() override; virtual void OnInputMethodDestroyed( - const ui::InputMethod* input_method) OVERRIDE; + const ui::InputMethod* input_method) override; // Represents waiting type of text input event. WaitImeEventType waiting_type_; |