diff options
22 files changed, 284 insertions, 320 deletions
diff --git a/chrome/browser/chromeos/input_method/accessibility.h b/chrome/browser/chromeos/input_method/accessibility.h index 0ad3692..d295d28 100644 --- a/chrome/browser/chromeos/input_method/accessibility.h +++ b/chrome/browser/chromeos/input_method/accessibility.h @@ -15,12 +15,11 @@ class Accessibility : public InputMethodManager::Observer { public: explicit Accessibility(InputMethodManager* imm); - virtual ~Accessibility(); + ~Accessibility() override; private: // InputMethodManager::Observer implementation. - virtual void InputMethodChanged(InputMethodManager* imm, - bool show_message) override; + void InputMethodChanged(InputMethodManager* imm, 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 5929274..0ee42ed 100644 --- a/chrome/browser/chromeos/input_method/browser_state_monitor.h +++ b/chrome/browser/chromeos/input_method/browser_state_monitor.h @@ -26,14 +26,14 @@ class BrowserStateMonitor : public content::NotificationObserver { // ui_session_ is STATE_LOGIN_SCREEN. |observer| may be null. explicit BrowserStateMonitor( const base::Callback<void(InputMethodManager::UISessionState)>& observer); - virtual ~BrowserStateMonitor(); + ~BrowserStateMonitor() override; InputMethodManager::UISessionState ui_session() const { return ui_session_; } // content::NotificationObserver overrides: - virtual void Observe(int type, - const content::NotificationSource& source, - const content::NotificationDetails& details) override; + void Observe(int type, + const content::NotificationSource& source, + 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 f84d1e3..bce59ae 100644 --- a/chrome/browser/chromeos/input_method/candidate_window_controller_impl.h +++ b/chrome/browser/chromeos/input_method/candidate_window_controller_impl.h @@ -41,14 +41,12 @@ class CandidateWindowControllerImpl public IMECandidateWindowHandlerInterface { public: CandidateWindowControllerImpl(); - virtual ~CandidateWindowControllerImpl(); + ~CandidateWindowControllerImpl() override; // CandidateWindowController overrides: - virtual void AddObserver( - CandidateWindowController::Observer* observer) override; - virtual void RemoveObserver( - CandidateWindowController::Observer* observer) override; - virtual void Hide() override; + void AddObserver(CandidateWindowController::Observer* observer) override; + void RemoveObserver(CandidateWindowController::Observer* observer) override; + void Hide() override; protected: static void ConvertLookupTableToInfolistEntry( @@ -58,20 +56,20 @@ class CandidateWindowControllerImpl private: // ui::ime::CandidateWindowView::Observer implementation. - virtual void OnCandidateCommitted(int index) override; + void OnCandidateCommitted(int index) override; // views::WidgetObserver implementation. - virtual void OnWidgetClosing(views::Widget* widget) override; + void OnWidgetClosing(views::Widget* widget) override; // IMECandidateWindowHandlerInterface implementation. - virtual void SetCursorBounds(const gfx::Rect& cursor_bounds, - const gfx::Rect& composition_head) override; - virtual void UpdateLookupTable( - const ui::CandidateWindow& candidate_window, - bool visible) override; - virtual void UpdatePreeditText(const base::string16& text, - unsigned int cursor, bool visible) override; - virtual void FocusStateChanged(bool is_focused) override; + void SetCursorBounds(const gfx::Rect& cursor_bounds, + const gfx::Rect& composition_head) override; + void UpdateLookupTable(const ui::CandidateWindow& candidate_window, + bool visible) override; + void UpdatePreeditText(const base::string16& text, + unsigned int cursor, + bool visible) override; + 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 88edec2..9c9c9fa 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 @@ -24,17 +24,17 @@ class ComponentExtensionIMEManagerImpl : public ComponentExtensionIMEManagerDelegate { public: ComponentExtensionIMEManagerImpl(); - virtual ~ComponentExtensionIMEManagerImpl(); + ~ComponentExtensionIMEManagerImpl() override; // ComponentExtensionIMEManagerDelegate overrides: - 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; - virtual void Unload(Profile* profile, - const std::string& extension_id, - const base::FilePath& file_path) override; + std::vector<ComponentExtensionIME> ListIME() override; + void Load(Profile* profile, + const std::string& extension_id, + const std::string& manifest, + const base::FilePath& file_path) override; + void Unload(Profile* profile, + const std::string& extension_id, + 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 146630c..f4e1db6 100644 --- a/chrome/browser/chromeos/input_method/input_method_delegate_impl.h +++ b/chrome/browser/chromeos/input_method/input_method_delegate_impl.h @@ -19,15 +19,14 @@ namespace input_method { class InputMethodDelegateImpl : public InputMethodDelegate { public: InputMethodDelegateImpl(); - virtual ~InputMethodDelegateImpl(); + ~InputMethodDelegateImpl() override; // InputMethodDelegate implementation. - virtual std::string GetHardwareKeyboardLayouts() const override; - virtual base::string16 GetLocalizedString(int resource_id) const override; - virtual base::string16 GetDisplayLanguageName( + std::string GetHardwareKeyboardLayouts() const override; + base::string16 GetLocalizedString(int resource_id) const override; + base::string16 GetDisplayLanguageName( const std::string& language_code) const override; - virtual void SetHardwareKeyboardLayoutForTesting( - const std::string& layout) override; + void SetHardwareKeyboardLayoutForTesting(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 bcf85c4..4926370 100644 --- a/chrome/browser/chromeos/input_method/input_method_engine.h +++ b/chrome/browser/chromeos/input_method/input_method_engine.h @@ -36,59 +36,60 @@ class InputMethodEngine : public InputMethodEngineInterface { public: InputMethodEngine(); - virtual ~InputMethodEngine(); + ~InputMethodEngine() override; void Initialize(scoped_ptr<InputMethodEngineInterface::Observer> observer, const char* extension_id); // InputMethodEngineInterface overrides. - 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; - virtual bool CommitText(int context_id, const char* text, - std::string* error) override; - virtual bool SendKeyEvents(int context_id, - const std::vector<KeyboardEvent>& events) override; - virtual const CandidateWindowProperty& - GetCandidateWindowProperty() const override; - virtual void SetCandidateWindowProperty( + const std::string& GetActiveComponentId() const override; + 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; + bool ClearComposition(int context_id, std::string* error) override; + bool CommitText(int context_id, + const char* text, + std::string* error) override; + bool SendKeyEvents(int context_id, + const std::vector<KeyboardEvent>& events) override; + const CandidateWindowProperty& GetCandidateWindowProperty() const override; + void SetCandidateWindowProperty( const CandidateWindowProperty& property) override; - virtual bool SetCandidateWindowVisible(bool visible, - std::string* error) override; - virtual bool SetCandidates(int context_id, - const std::vector<Candidate>& candidates, + bool SetCandidateWindowVisible(bool visible, std::string* error) override; + bool SetCandidates(int context_id, + const std::vector<Candidate>& candidates, + std::string* error) override; + bool SetCursorPosition(int context_id, + int candidate_id, + std::string* error) override; + bool SetMenuItems(const std::vector<MenuItem>& items) override; + bool UpdateMenuItems(const std::vector<MenuItem>& items) override; + bool IsActive() const override; + bool DeleteSurroundingText(int context_id, + int offset, + size_t number_of_chars, 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; - virtual bool DeleteSurroundingText(int context_id, - int offset, - size_t number_of_chars, - std::string* error) override; // IMEEngineHandlerInterface overrides. - virtual void FocusIn( + 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; - virtual void ProcessKeyEvent(const ui::KeyEvent& key_event, - 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; - virtual void SetCompositionBounds(const gfx::Rect& bounds) override; + void FocusOut() override; + void Enable(const std::string& component_id) override; + void Disable() override; + void PropertyActivate(const std::string& property_name) override; + void Reset() override; + void ProcessKeyEvent(const ui::KeyEvent& key_event, + const KeyEventDoneCallback& callback) override; + void CandidateClicked(uint32 index) override; + void SetSurroundingText(const std::string& text, + uint32 cursor_pos, + uint32 anchor_pos) override; + void HideInputView() override; + void SetCompositionBounds(const gfx::Rect& bounds) 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 6c039d0..548a45f 100644 --- a/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc +++ b/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc @@ -53,13 +53,11 @@ class InputMethodEngineBrowserTest : ExtensionBrowserTest() {} virtual ~InputMethodEngineBrowserTest() {} - virtual void SetUpInProcessBrowserTestFixture() override { + void SetUpInProcessBrowserTestFixture() override { ExtensionBrowserTest::SetUpInProcessBrowserTestFixture(); } - virtual void TearDownInProcessBrowserTestFixture() override { - extension_ = NULL; - } + void TearDownInProcessBrowserTestFixture() override { extension_ = NULL; } protected: void LoadTestInputMethod() { diff --git a/chrome/browser/chromeos/input_method/input_method_engine_interface.h b/chrome/browser/chromeos/input_method/input_method_engine_interface.h index edb4969..ad8399b 100644 --- a/chrome/browser/chromeos/input_method/input_method_engine_interface.h +++ b/chrome/browser/chromeos/input_method/input_method_engine_interface.h @@ -177,7 +177,7 @@ class InputMethodEngineInterface : public IMEEngineHandlerInterface { virtual void OnReset(const std::string& engine_id) = 0; }; - virtual ~InputMethodEngineInterface() {} + ~InputMethodEngineInterface() override {} // Set the current composition and associated properties. virtual bool SetComposition(int context_id, 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 660d712..5aac5d2 100644 --- a/chrome/browser/chromeos/input_method/input_method_engine_unittest.cc +++ b/chrome/browser/chromeos/input_method/input_method_engine_unittest.cc @@ -66,43 +66,38 @@ void InitInputMethod() { class TestObserver : public InputMethodEngineInterface::Observer { public: TestObserver() : calls_bitmap_(NONE) {} - virtual ~TestObserver() {} + ~TestObserver() override {} - virtual void OnActivate(const std::string& engine_id) override { + void OnActivate(const std::string& engine_id) override { calls_bitmap_ |= ACTIVATE; } - virtual void OnDeactivated(const std::string& engine_id) override { + void OnDeactivated(const std::string& engine_id) override { calls_bitmap_ |= DEACTIVATED; } - virtual void OnFocus( + void OnFocus( const InputMethodEngineInterface::InputContext& context) override { calls_bitmap_ |= ONFOCUS; } - 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 {} - virtual void OnInputContextUpdate( + void OnBlur(int context_id) override { calls_bitmap_ |= ONBLUR; } + void OnKeyEvent(const std::string& engine_id, + const InputMethodEngineInterface::KeyboardEvent& event, + input_method::KeyEventHandle* key_data) override {} + void OnInputContextUpdate( const InputMethodEngineInterface::InputContext& context) override {} - virtual void OnCandidateClicked( + void OnCandidateClicked( const std::string& engine_id, int candidate_id, InputMethodEngineInterface::MouseButtonEvent button) override {} - virtual void OnMenuItemActivated( - const std::string& engine_id, - 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 OnCompositionBoundsChanged(const gfx::Rect& bounds) override { + void OnMenuItemActivated(const std::string& engine_id, + const std::string& menu_id) override {} + void OnSurroundingTextChanged(const std::string& engine_id, + const std::string& text, + int cursor_pos, + int anchor_pos) override {} + void OnCompositionBoundsChanged(const gfx::Rect& bounds) override { calls_bitmap_ |= ONCOMPOSITIONBOUNDSCHANGED; } - virtual void OnReset(const std::string& engine_id) override {} + void OnReset(const std::string& engine_id) override {} unsigned char GetCallsBitmapAndReset() { unsigned char ret = calls_bitmap_; @@ -127,7 +122,7 @@ class InputMethodEngineTest : public testing::Test { IMEBridge::Get()->SetInputContextHandler( mock_ime_input_context_handler_.get()); } - virtual ~InputMethodEngineTest() { + ~InputMethodEngineTest() override { IMEBridge::Get()->SetInputContextHandler(NULL); engine_.reset(); Shutdown(); 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 84299b1..8c930d5 100644 --- a/chrome/browser/chromeos/input_method/input_method_manager_impl.h +++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.h @@ -70,44 +70,36 @@ 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 void AddInputMethodExtension( - const std::string& extension_id, - const InputMethodDescriptors& descriptors, - InputMethodEngineInterface* instance) override; - virtual void RemoveInputMethodExtension( - const std::string& extension_id) override; - virtual void ChangeInputMethod(const std::string& input_method_id, - bool show_message) override; - virtual bool EnableInputMethod( + scoped_refptr<InputMethodManager::State> Clone() const override; + void AddInputMethodExtension(const std::string& extension_id, + const InputMethodDescriptors& descriptors, + InputMethodEngineInterface* instance) override; + void RemoveInputMethodExtension(const std::string& extension_id) override; + void ChangeInputMethod(const std::string& input_method_id, + bool show_message) override; + bool EnableInputMethod( const std::string& new_active_input_method_id) override; - virtual void EnableLoginLayouts( + void EnableLoginLayouts( const std::string& language_code, const std::vector<std::string>& initial_layouts) override; - virtual void EnableLockScreenLayouts() override; - virtual void GetInputMethodExtensions( - InputMethodDescriptors* result) override; - virtual scoped_ptr<InputMethodDescriptors> GetActiveInputMethods() - const override; - virtual const std::vector<std::string>& GetActiveInputMethodIds() - const override; - virtual const InputMethodDescriptor* GetInputMethodFromId( + void EnableLockScreenLayouts() override; + void GetInputMethodExtensions(InputMethodDescriptors* result) override; + scoped_ptr<InputMethodDescriptors> GetActiveInputMethods() const override; + const std::vector<std::string>& GetActiveInputMethodIds() const override; + const InputMethodDescriptor* GetInputMethodFromId( 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; - virtual void SetInputMethodLoginDefaultFromVPD( - const std::string& locale, - const std::string& layout) override; - virtual bool CanCycleInputMethod() override; - virtual void SwitchToNextInputMethod() override; - virtual void SwitchToPreviousInputMethod() override; - virtual bool CanSwitchInputMethod( - const ui::Accelerator& accelerator) override; - virtual void SwitchInputMethod(const ui::Accelerator& accelerator) override; - virtual InputMethodDescriptor GetCurrentInputMethod() const override; - virtual bool ReplaceEnabledInputMethods( + size_t GetNumActiveInputMethods() const override; + void SetEnabledExtensionImes(std::vector<std::string>* ids) override; + void SetInputMethodLoginDefault() override; + void SetInputMethodLoginDefaultFromVPD(const std::string& locale, + const std::string& layout) override; + bool CanCycleInputMethod() override; + void SwitchToNextInputMethod() override; + void SwitchToPreviousInputMethod() override; + bool CanSwitchInputMethod(const ui::Accelerator& accelerator) override; + void SwitchInputMethod(const ui::Accelerator& accelerator) override; + InputMethodDescriptor GetCurrentInputMethod() const override; + bool ReplaceEnabledInputMethods( const std::vector<std::string>& new_active_input_method_ids) override; // ------------------------- Data members. @@ -134,7 +126,7 @@ class InputMethodManagerImpl : public InputMethodManager, protected: friend base::RefCounted<chromeos::input_method::InputMethodManager::State>; - virtual ~StateImpl(); + ~StateImpl() override; }; // Constructs an InputMethodManager instance. The client is responsible for @@ -142,40 +134,36 @@ class InputMethodManagerImpl : public InputMethodManager, // state. InputMethodManagerImpl(scoped_ptr<InputMethodDelegate> delegate, bool enable_extension_loading); - virtual ~InputMethodManagerImpl(); + ~InputMethodManagerImpl() override; // Receives notification of an InputMethodManager::UISessionState transition. void SetUISessionState(UISessionState new_ui_session); // InputMethodManager override: - virtual UISessionState GetUISessionState() override; - virtual void AddObserver(InputMethodManager::Observer* observer) override; - virtual void AddCandidateWindowObserver( + UISessionState GetUISessionState() override; + void AddObserver(InputMethodManager::Observer* observer) override; + void AddCandidateWindowObserver( InputMethodManager::CandidateWindowObserver* observer) override; - virtual void RemoveObserver(InputMethodManager::Observer* observer) override; - virtual void RemoveCandidateWindowObserver( + void RemoveObserver(InputMethodManager::Observer* observer) override; + void RemoveCandidateWindowObserver( 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; - virtual ComponentExtensionIMEManager* - GetComponentExtensionIMEManager() override; - virtual bool IsLoginKeyboard(const std::string& layout) const override; - - virtual bool MigrateInputMethods( - std::vector<std::string>* input_method_ids) override; - - virtual scoped_refptr<InputMethodManager::State> CreateNewState( + scoped_ptr<InputMethodDescriptors> GetSupportedInputMethods() const override; + void ActivateInputMethodMenuItem(const std::string& key) override; + bool IsISOLevel5ShiftUsedByCurrentInputMethod() const override; + bool IsAltGrUsedByCurrentInputMethod() const override; + + ImeKeyboard* GetImeKeyboard() override; + InputMethodUtil* GetInputMethodUtil() override; + ComponentExtensionIMEManager* GetComponentExtensionIMEManager() override; + bool IsLoginKeyboard(const std::string& layout) const override; + + bool MigrateInputMethods(std::vector<std::string>* input_method_ids) override; + + scoped_refptr<InputMethodManager::State> CreateNewState( Profile* profile) override; - virtual scoped_refptr<InputMethodManager::State> GetActiveIMEState() override; - virtual void SetState( - scoped_refptr<InputMethodManager::State> state) override; + scoped_refptr<InputMethodManager::State> GetActiveIMEState() override; + void SetState(scoped_refptr<InputMethodManager::State> state) override; // Sets |candidate_window_controller_|. void SetCandidateWindowControllerForTesting( @@ -190,9 +178,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; + void CandidateClicked(int index) override; + void CandidateWindowOpened() override; + 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 a51cf87..4cde59c 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 @@ -68,14 +68,14 @@ class TestObserver : public InputMethodManager::Observer, input_method_menu_item_changed_count_(0), last_show_message_(false) { } - virtual ~TestObserver() {} + ~TestObserver() override {} - virtual void InputMethodChanged(InputMethodManager* manager, - bool show_message) override { + void InputMethodChanged(InputMethodManager* manager, + bool show_message) override { ++input_method_changed_count_; last_show_message_ = show_message; } - virtual void InputMethodMenuItemChanged( + void InputMethodMenuItemChanged( ui::ime::InputMethodMenuManager* manager) override { ++input_method_menu_item_changed_count_; } @@ -96,12 +96,12 @@ class TestCandidateWindowObserver candidate_window_closed_count_(0) { } - virtual ~TestCandidateWindowObserver() {} + ~TestCandidateWindowObserver() override {} - virtual void CandidateWindowOpened(InputMethodManager* manager) override { + void CandidateWindowOpened(InputMethodManager* manager) override { ++candidate_window_opened_count_; } - virtual void CandidateWindowClosed(InputMethodManager* manager) override { + void CandidateWindowClosed(InputMethodManager* manager) override { ++candidate_window_closed_count_; } @@ -120,9 +120,9 @@ class InputMethodManagerImplTest : public BrowserWithTestWindowTest { candidate_window_controller_(NULL), keyboard_(NULL) { } - virtual ~InputMethodManagerImplTest() {} + ~InputMethodManagerImplTest() override {} - virtual void SetUp() override { + 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 { + 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 1de944b..fc7c802 100644 --- a/chrome/browser/chromeos/input_method/input_method_persistence.h +++ b/chrome/browser/chromeos/input_method/input_method_persistence.h @@ -26,14 +26,14 @@ class InputMethodPersistence : public InputMethodManager::Observer { // OnSessionStateChange whenever the InputMethodManager::UISessionState // changes. explicit InputMethodPersistence(InputMethodManager* input_method_manager); - virtual ~InputMethodPersistence(); + ~InputMethodPersistence() override; // Receives notification of session state changes. void OnSessionStateChange(InputMethodManager::UISessionState new_session); // InputMethodManager::Observer overrides. - virtual void InputMethodChanged(InputMethodManager* manager, - bool show_message) override; + void InputMethodChanged(InputMethodManager* manager, + 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 1bb456d..35f36c3e8 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 { + void SetUp() override { ASSERT_TRUE(mock_profile_manager_.SetUp()); // Add a user. diff --git a/chrome/browser/chromeos/input_method/input_method_syncer.h b/chrome/browser/chromeos/input_method/input_method_syncer.h index 56fcf47..20d04fe 100644 --- a/chrome/browser/chromeos/input_method/input_method_syncer.h +++ b/chrome/browser/chromeos/input_method/input_method_syncer.h @@ -33,7 +33,7 @@ class InputMethodSyncer : public PrefServiceSyncableObserver { InputMethodSyncer( PrefServiceSyncable* prefs, scoped_refptr<input_method::InputMethodManager::State> ime_state); - virtual ~InputMethodSyncer(); + ~InputMethodSyncer() override; // Registers the syncable input method prefs. static void RegisterProfilePrefs( 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 9373a97..ada8107 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 { + 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 71d6620..37546b2 100644 --- a/chrome/browser/chromeos/input_method/mock_candidate_window_controller.h +++ b/chrome/browser/chromeos/input_method/mock_candidate_window_controller.h @@ -16,12 +16,12 @@ namespace input_method { class MockCandidateWindowController : public CandidateWindowController { public: MockCandidateWindowController(); - virtual ~MockCandidateWindowController(); + ~MockCandidateWindowController() override; // CandidateWindowController overrides: - virtual void AddObserver(Observer* observer) override; - virtual void RemoveObserver(Observer* observer) override; - virtual void Hide() override; + void AddObserver(Observer* observer) override; + void RemoveObserver(Observer* observer) override; + 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 32e0df8..0b8387e 100644 --- a/chrome/browser/chromeos/input_method/mock_input_method_engine.h +++ b/chrome/browser/chromeos/input_method/mock_input_method_engine.h @@ -31,56 +31,57 @@ struct KeyEventHandle; class MockInputMethodEngine : public InputMethodEngineInterface { public: MockInputMethodEngine(); - virtual ~MockInputMethodEngine(); + ~MockInputMethodEngine() override; // InputMethodEngineInterface overrides. - 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; - virtual bool CommitText(int context_id, const char* text, - std::string* error) override; - virtual bool SendKeyEvents(int context_id, - const std::vector<KeyboardEvent>& events) override; - virtual const CandidateWindowProperty& - GetCandidateWindowProperty() const override; - virtual void SetCandidateWindowProperty( + const std::string& GetActiveComponentId() const override; + 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; + bool ClearComposition(int context_id, std::string* error) override; + bool CommitText(int context_id, + const char* text, + std::string* error) override; + bool SendKeyEvents(int context_id, + const std::vector<KeyboardEvent>& events) override; + const CandidateWindowProperty& GetCandidateWindowProperty() const override; + void SetCandidateWindowProperty( const CandidateWindowProperty& property) override; - virtual bool SetCandidateWindowVisible(bool visible, - std::string* error) override; - virtual bool SetCandidates(int context_id, - const std::vector<Candidate>& candidates, + bool SetCandidateWindowVisible(bool visible, std::string* error) override; + bool SetCandidates(int context_id, + const std::vector<Candidate>& candidates, + std::string* error) override; + bool SetCursorPosition(int context_id, + int candidate_id, + std::string* error) override; + bool SetMenuItems(const std::vector<MenuItem>& items) override; + bool UpdateMenuItems(const std::vector<MenuItem>& items) override; + bool IsActive() const override; + bool DeleteSurroundingText(int context_id, + int offset, + size_t number_of_chars, 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; - virtual bool DeleteSurroundingText(int context_id, - int offset, - size_t number_of_chars, - std::string* error) override; // IMEEngineHandlerInterface overrides. - virtual void FocusIn( + 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; - virtual void ProcessKeyEvent(const ui::KeyEvent& key_event, - 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 SetCompositionBounds(const gfx::Rect& bounds) override; - virtual void HideInputView() override; + void FocusOut() override; + void Enable(const std::string& component_id) override; + void Disable() override; + void PropertyActivate(const std::string& property_name) override; + void Reset() override; + void ProcessKeyEvent(const ui::KeyEvent& key_event, + const KeyEventDoneCallback& callback) override; + void CandidateClicked(uint32 index) override; + void SetSurroundingText(const std::string& text, + uint32 cursor_pos, + uint32 anchor_pos) override; + void SetCompositionBounds(const gfx::Rect& bounds) override; + 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 a568fc6..7673045 100644 --- a/chrome/browser/chromeos/input_method/mock_input_method_manager.h +++ b/chrome/browser/chromeos/input_method/mock_input_method_manager.h @@ -22,44 +22,36 @@ class MockInputMethodManager : public InputMethodManager { public: explicit State(MockInputMethodManager* manager); - virtual scoped_refptr<InputMethodManager::State> Clone() const override; - virtual void AddInputMethodExtension( - const std::string& extension_id, - const InputMethodDescriptors& descriptors, - InputMethodEngineInterface* instance) override; - virtual void RemoveInputMethodExtension( - const std::string& extension_id) override; - virtual void ChangeInputMethod(const std::string& input_method_id, - bool show_message) override; - virtual bool EnableInputMethod( + scoped_refptr<InputMethodManager::State> Clone() const override; + void AddInputMethodExtension(const std::string& extension_id, + const InputMethodDescriptors& descriptors, + InputMethodEngineInterface* instance) override; + void RemoveInputMethodExtension(const std::string& extension_id) override; + void ChangeInputMethod(const std::string& input_method_id, + bool show_message) override; + bool EnableInputMethod( const std::string& new_active_input_method_id) override; - virtual void EnableLoginLayouts( + void EnableLoginLayouts( const std::string& language_code, const std::vector<std::string>& initial_layouts) override; - virtual void EnableLockScreenLayouts() override; - virtual void GetInputMethodExtensions( - InputMethodDescriptors* result) override; - virtual scoped_ptr<InputMethodDescriptors> GetActiveInputMethods() - const override; - virtual const std::vector<std::string>& GetActiveInputMethodIds() - const override; - virtual const InputMethodDescriptor* GetInputMethodFromId( + void EnableLockScreenLayouts() override; + void GetInputMethodExtensions(InputMethodDescriptors* result) override; + scoped_ptr<InputMethodDescriptors> GetActiveInputMethods() const override; + const std::vector<std::string>& GetActiveInputMethodIds() const override; + const InputMethodDescriptor* GetInputMethodFromId( 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; - virtual void SetInputMethodLoginDefaultFromVPD( - const std::string& locale, - const std::string& layout) override; - virtual bool CanCycleInputMethod() override; - virtual void SwitchToNextInputMethod() override; - virtual void SwitchToPreviousInputMethod() override; - virtual bool CanSwitchInputMethod( - const ui::Accelerator& accelerator) override; - virtual void SwitchInputMethod(const ui::Accelerator& accelerator) override; - virtual InputMethodDescriptor GetCurrentInputMethod() const override; - virtual bool ReplaceEnabledInputMethods( + size_t GetNumActiveInputMethods() const override; + void SetEnabledExtensionImes(std::vector<std::string>* ids) override; + void SetInputMethodLoginDefault() override; + void SetInputMethodLoginDefaultFromVPD(const std::string& locale, + const std::string& layout) override; + bool CanCycleInputMethod() override; + void SwitchToNextInputMethod() override; + void SwitchToPreviousInputMethod() override; + bool CanSwitchInputMethod(const ui::Accelerator& accelerator) override; + void SwitchInputMethod(const ui::Accelerator& accelerator) override; + InputMethodDescriptor GetCurrentInputMethod() const override; + bool ReplaceEnabledInputMethods( const std::vector<std::string>& new_active_input_method_ids) override; // The value GetCurrentInputMethod().id() will return. @@ -70,39 +62,35 @@ class MockInputMethodManager : public InputMethodManager { protected: friend base::RefCounted<chromeos::input_method::InputMethodManager::State>; - virtual ~State(); + ~State() override; MockInputMethodManager* const manager_; }; MockInputMethodManager(); - virtual ~MockInputMethodManager(); + ~MockInputMethodManager() override; // InputMethodManager override: - virtual UISessionState GetUISessionState() override; - virtual void AddObserver(InputMethodManager::Observer* observer) override; - virtual void AddCandidateWindowObserver( + UISessionState GetUISessionState() override; + void AddObserver(InputMethodManager::Observer* observer) override; + void AddCandidateWindowObserver( InputMethodManager::CandidateWindowObserver* observer) override; - virtual void RemoveObserver(InputMethodManager::Observer* observer) override; - virtual void RemoveCandidateWindowObserver( + void RemoveObserver(InputMethodManager::Observer* observer) override; + void RemoveCandidateWindowObserver( 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; - virtual ComponentExtensionIMEManager* - GetComponentExtensionIMEManager() override; - virtual bool IsLoginKeyboard(const std::string& layout) const override; - virtual bool MigrateInputMethods( - std::vector<std::string>* input_method_ids) override; - virtual scoped_refptr<InputMethodManager::State> CreateNewState( + scoped_ptr<InputMethodDescriptors> GetSupportedInputMethods() const override; + void ActivateInputMethodMenuItem(const std::string& key) override; + bool IsISOLevel5ShiftUsedByCurrentInputMethod() const override; + bool IsAltGrUsedByCurrentInputMethod() const override; + ImeKeyboard* GetImeKeyboard() override; + InputMethodUtil* GetInputMethodUtil() override; + ComponentExtensionIMEManager* GetComponentExtensionIMEManager() override; + bool IsLoginKeyboard(const std::string& layout) const override; + bool MigrateInputMethods(std::vector<std::string>* input_method_ids) override; + scoped_refptr<InputMethodManager::State> CreateNewState( Profile* profile) override; - virtual scoped_refptr<InputMethodManager::State> GetActiveIMEState() override; - virtual void SetState( - scoped_refptr<InputMethodManager::State> state) override; + scoped_refptr<InputMethodManager::State> GetActiveIMEState() override; + void SetState(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 244feb5..e6a9189 100644 --- a/chrome/browser/chromeos/input_method/mode_indicator_browsertest.cc +++ b/chrome/browser/chromeos/input_method/mode_indicator_browsertest.cc @@ -31,7 +31,7 @@ class ScopedModeIndicatorObserverForTesting : ModeIndicatorController::SetModeIndicatorObserverForTesting(this); } - virtual ~ScopedModeIndicatorObserverForTesting() { + ~ScopedModeIndicatorObserverForTesting() override { for (size_t i = 0; i < widget_list_.size(); ++i) { widget_list_[i]->RemoveObserver(this); } @@ -59,7 +59,7 @@ class ScopedModeIndicatorObserverForTesting : } // ModeIndicatorObserverInterface override: - virtual void AddModeIndicatorWidget(views::Widget* widget) override { + 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 { + 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()) @@ -75,8 +75,7 @@ class ScopedModeIndicatorObserverForTesting : } // views::WidgetObserver override: - virtual void OnWidgetVisibilityChanged(views::Widget* widget, - bool visible) override { + void OnWidgetVisibilityChanged(views::Widget* widget, bool visible) override { last_bounds_ = widget->GetWindowBoundsInScreen(); is_displayed_ |= visible; } @@ -92,9 +91,9 @@ class ModeIndicatorBrowserTest : public InProcessBrowserTest { public: ModeIndicatorBrowserTest() : InProcessBrowserTest() {} - virtual ~ModeIndicatorBrowserTest() {} + ~ModeIndicatorBrowserTest() override {} - virtual void SetUpInProcessBrowserTestFixture() override { + 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 a168605..64c30a3 100644 --- a/chrome/browser/chromeos/input_method/mode_indicator_controller.cc +++ b/chrome/browser/chromeos/input_method/mode_indicator_controller.cc @@ -24,14 +24,14 @@ class ModeIndicatorObserver : public ModeIndicatorObserverInterface { ModeIndicatorObserver() : active_widget_(NULL) {} - virtual ~ModeIndicatorObserver() { + ~ModeIndicatorObserver() override { if (active_widget_) active_widget_->RemoveObserver(this); } // 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 { + 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 { + 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 c85c813..ad6e905 100644 --- a/chrome/browser/chromeos/input_method/mode_indicator_controller.h +++ b/chrome/browser/chromeos/input_method/mode_indicator_controller.h @@ -16,7 +16,7 @@ namespace input_method { class ModeIndicatorObserverInterface : public views::WidgetObserver { public: ModeIndicatorObserverInterface() {} - virtual ~ModeIndicatorObserverInterface() {} + ~ModeIndicatorObserverInterface() override {} virtual void AddModeIndicatorWidget(views::Widget* widget) = 0; }; @@ -29,7 +29,7 @@ class ModeIndicatorController public: // This class takes the ownership of |mi_widget|. explicit ModeIndicatorController(InputMethodManager* imm); - virtual ~ModeIndicatorController(); + ~ModeIndicatorController() override; // Set cursor bounds, which is the base point to display this indicator. // Bacisally this indicator is displayed underneath the cursor. @@ -46,8 +46,8 @@ class ModeIndicatorController private: // InputMethodManager::Observer implementation. - virtual void InputMethodChanged(InputMethodManager* manager, - bool show_message) override; + void InputMethodChanged(InputMethodManager* manager, + 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 2295107..bd71f71 100644 --- a/chrome/browser/chromeos/input_method/textinput_test_helper.h +++ b/chrome/browser/chromeos/input_method/textinput_test_helper.h @@ -21,9 +21,10 @@ namespace chromeos { class TextInputTestBase : public InProcessBrowserTest { public: TextInputTestBase() {} - virtual ~TextInputTestBase() {} + ~TextInputTestBase() override {} + + void SetUpInProcessBrowserTestFixture() override; - virtual void SetUpInProcessBrowserTestFixture() override; private: DISALLOW_COPY_AND_ASSIGN(TextInputTestBase); }; @@ -32,7 +33,7 @@ class TextInputTestBase : public InProcessBrowserTest { class TextInputTestHelper : public ui::InputMethodObserver { public: TextInputTestHelper(); - virtual ~TextInputTestHelper(); + ~TextInputTestHelper() override; // Returns the latest status notified to ui::InputMethod base::string16 GetSurroundingText() const; @@ -71,16 +72,13 @@ 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; - virtual void OnTextInputStateChanged( - const ui::TextInputClient* client) override; - virtual void OnShowImeIfNeeded() override; - virtual void OnInputMethodDestroyed( - const ui::InputMethod* input_method) override; + void OnTextInputTypeChanged(const ui::TextInputClient* client) override; + void OnFocus() override; + void OnBlur() override; + void OnCaretBoundsChanged(const ui::TextInputClient* client) override; + void OnTextInputStateChanged(const ui::TextInputClient* client) override; + void OnShowImeIfNeeded() override; + void OnInputMethodDestroyed(const ui::InputMethod* input_method) override; // Represents waiting type of text input event. WaitImeEventType waiting_type_; |