| Index: chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc
|
| diff --git a/chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc b/chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc
|
| index e5bb176f99dd094f7155313ad59a5ea5ec418a80..44aee578bda0a14a855364e7aa17aaf6385583da 100644
|
| --- a/chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc
|
| +++ b/chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc
|
| @@ -44,11 +44,11 @@ using base::ASCIIToUTF16;
|
| class AccessibilityViewsDelegate : public views::TestViewsDelegate {
|
| public:
|
| AccessibilityViewsDelegate() {}
|
| - virtual ~AccessibilityViewsDelegate() {}
|
| + ~AccessibilityViewsDelegate() override {}
|
|
|
| // Overridden from views::TestViewsDelegate:
|
| - virtual void NotifyAccessibilityEvent(
|
| - views::View* view, ui::AXEvent event_type) override {
|
| + void NotifyAccessibilityEvent(views::View* view,
|
| + ui::AXEvent event_type) override {
|
| AccessibilityEventRouterViews::GetInstance()->HandleAccessibilityEvent(
|
| view, event_type);
|
| }
|
| @@ -63,12 +63,12 @@ class AccessibilityWindowDelegate : public views::WidgetDelegate {
|
| : contents_(contents) { }
|
|
|
| // Overridden from views::WidgetDelegate:
|
| - virtual void DeleteDelegate() override { delete this; }
|
| - virtual views::View* GetContentsView() override { return contents_; }
|
| - virtual const views::Widget* GetWidget() const override {
|
| + void DeleteDelegate() override { delete this; }
|
| + views::View* GetContentsView() override { return contents_; }
|
| + const views::Widget* GetWidget() const override {
|
| return contents_->GetWidget();
|
| }
|
| - virtual views::Widget* GetWidget() override { return contents_->GetWidget(); }
|
| + views::Widget* GetWidget() override { return contents_->GetWidget(); }
|
|
|
| private:
|
| views::View* contents_;
|
| @@ -84,7 +84,7 @@ class ViewWithNameAndRole : public views::View {
|
| role_(role) {
|
| }
|
|
|
| - virtual void GetAccessibleState(ui::AXViewState* state) override {
|
| + void GetAccessibleState(ui::AXViewState* state) override {
|
| views::View::GetAccessibleState(state);
|
| state->name = name_;
|
| state->role = role_;
|
| @@ -104,7 +104,7 @@ class AccessibilityEventRouterViewsTest
|
| AccessibilityEventRouterViewsTest() : control_event_count_(0) {
|
| }
|
|
|
| - virtual void SetUp() {
|
| + void SetUp() override {
|
| #if defined(OS_WIN)
|
| ole_initializer_.reset(new ui::ScopedOleInitializer());
|
| #endif
|
| @@ -122,7 +122,7 @@ class AccessibilityEventRouterViewsTest
|
| EnableAccessibilityAndListenToFocusNotifications();
|
| }
|
|
|
| - virtual void TearDown() {
|
| + void TearDown() override {
|
| ClearCallback();
|
| #if defined(USE_AURA)
|
| aura_test_helper_->TearDown();
|
| @@ -462,7 +462,7 @@ class SimpleMenuDelegate : public ui::SimpleMenuModel::Delegate {
|
| };
|
|
|
| SimpleMenuDelegate() {}
|
| - virtual ~SimpleMenuDelegate() {}
|
| + ~SimpleMenuDelegate() override {}
|
|
|
| views::MenuItemView* BuildMenu() {
|
| menu_model_.reset(new ui::SimpleMenuModel(this));
|
| @@ -479,26 +479,20 @@ class SimpleMenuDelegate : public ui::SimpleMenuModel::Delegate {
|
| return menu_view;
|
| }
|
|
|
| - virtual bool IsCommandIdChecked(int command_id) const override {
|
| - return false;
|
| - }
|
| + bool IsCommandIdChecked(int command_id) const override { return false; }
|
|
|
| - virtual bool IsCommandIdEnabled(int command_id) const override {
|
| - return true;
|
| - }
|
| + bool IsCommandIdEnabled(int command_id) const override { return true; }
|
|
|
| - virtual bool IsCommandIdVisible(int command_id) const override {
|
| + bool IsCommandIdVisible(int command_id) const override {
|
| return command_id != IDC_MENU_INVISIBLE;
|
| }
|
|
|
| - virtual bool GetAcceleratorForCommandId(
|
| - int command_id,
|
| - ui::Accelerator* accelerator) override {
|
| + bool GetAcceleratorForCommandId(int command_id,
|
| + ui::Accelerator* accelerator) override {
|
| return false;
|
| }
|
|
|
| - virtual void ExecuteCommand(int command_id, int event_flags) override {
|
| - }
|
| + void ExecuteCommand(int command_id, int event_flags) override {}
|
|
|
| private:
|
| scoped_ptr<ui::SimpleMenuModel> menu_model_;
|
|
|