| Index: chrome/browser/ui/ash/ime_controller_chromeos.h
|
| diff --git a/chrome/browser/ui/ash/ime_controller_chromeos.h b/chrome/browser/ui/ash/ime_controller_chromeos.h
|
| index 0c0f15dcbd847bee9cb7ba83f9a6d4dfd9215b6c..b12aa28492acd458873a6a0f883f1baa6c8884a7 100644
|
| --- a/chrome/browser/ui/ash/ime_controller_chromeos.h
|
| +++ b/chrome/browser/ui/ash/ime_controller_chromeos.h
|
| @@ -17,11 +17,11 @@ class ImeController : public ash::ImeControlDelegate {
|
| virtual ~ImeController() {}
|
|
|
| // Overridden from ash::ImeControlDelegate:
|
| - virtual void HandleNextIme() OVERRIDE;
|
| - virtual bool HandlePreviousIme(const ui::Accelerator& accelerator) OVERRIDE;
|
| - virtual bool HandleSwitchIme(const ui::Accelerator& accelerator) OVERRIDE;
|
| + virtual void HandleNextIme() override;
|
| + virtual bool HandlePreviousIme(const ui::Accelerator& accelerator) override;
|
| + virtual bool HandleSwitchIme(const ui::Accelerator& accelerator) override;
|
| virtual ui::Accelerator RemapAccelerator(
|
| - const ui::Accelerator& accelerator) OVERRIDE;
|
| + const ui::Accelerator& accelerator) override;
|
|
|
| private:
|
| bool UsingFrenchInputMethod() const;
|
|
|