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

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

Issue 796693005: Update {virtual,override,final} to follow C++11 style in chrome/browser/chromeos/input_method. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/input_method/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 84299b11bd554f2c802dd9fadb030f21f84d05cf..8c930d5a2438edd861a2ef454da711249e10398e 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

Powered by Google App Engine
This is Rietveld 408576698