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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 623293003: replace OVERRIDE and FINAL with override and final in chrome/browser/chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: run git cl format on echo_dialog_view.h Created 6 years, 2 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
« no previous file with comments | « chrome/browser/chromeos/input_method/input_method_engine_unittest.cc ('k') | chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/input_method/input_method_manager_impl.h
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 88640007d3765c930f15f2fb6c888a49ffdf5ac3..6ccc24f33cf7f018fb6abb81feee51e4315a33f6 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
« no previous file with comments | « chrome/browser/chromeos/input_method/input_method_engine_unittest.cc ('k') | chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698