diff options
| author | mostynb <mostynb@opera.com> | 2014-10-09 03:54:27 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-09 10:55:07 +0000 |
| commit | 3b3d52b1844d5174f63a1db8cf3f0e3254ec43f6 (patch) | |
| tree | 720b6c8d126123e087abffedaedd8a9fa4907132 /ui | |
| parent | 002d02909368b7067cc3df9149c5e46ce445861c (diff) | |
| download | chromium_src-3b3d52b1844d5174f63a1db8cf3f0e3254ec43f6.zip chromium_src-3b3d52b1844d5174f63a1db8cf3f0e3254ec43f6.tar.gz chromium_src-3b3d52b1844d5174f63a1db8cf3f0e3254ec43f6.tar.bz2 | |
replace OVERRIDE and FINAL with override and final in ui/
BUG=417463
Review URL: https://codereview.chromium.org/623293004
Cr-Commit-Position: refs/heads/master@{#298839}
Diffstat (limited to 'ui')
712 files changed, 5436 insertions, 5436 deletions
diff --git a/ui/accessibility/ax_serializable_tree.cc b/ui/accessibility/ax_serializable_tree.cc index 4e4da83..3198b61 100644 --- a/ui/accessibility/ax_serializable_tree.cc +++ b/ui/accessibility/ax_serializable_tree.cc @@ -20,44 +20,44 @@ class AX_EXPORT AXTreeSourceAdapter : public AXTreeSource<const AXNode*> { virtual ~AXTreeSourceAdapter() {} // AXTreeSource implementation. - virtual AXNode* GetRoot() const OVERRIDE { + virtual AXNode* GetRoot() const override { return tree_->GetRoot(); } - virtual AXNode* GetFromId(int32 id) const OVERRIDE { + virtual AXNode* GetFromId(int32 id) const override { return tree_->GetFromId(id); } - virtual int32 GetId(const AXNode* node) const OVERRIDE { + virtual int32 GetId(const AXNode* node) const override { return node->id(); } virtual void GetChildren( const AXNode* node, - std::vector<const AXNode*>* out_children) const OVERRIDE { + std::vector<const AXNode*>* out_children) const override { for (int i = 0; i < node->child_count(); ++i) out_children->push_back(node->ChildAtIndex(i)); } - virtual AXNode* GetParent(const AXNode* node) const OVERRIDE { + virtual AXNode* GetParent(const AXNode* node) const override { return node->parent(); } - virtual bool IsValid(const AXNode* node) const OVERRIDE { + virtual bool IsValid(const AXNode* node) const override { return node != NULL; } virtual bool IsEqual(const AXNode* node1, - const AXNode* node2) const OVERRIDE { + const AXNode* node2) const override { return node1 == node2; } - virtual const AXNode* GetNull() const OVERRIDE { + virtual const AXNode* GetNull() const override { return NULL; } virtual void SerializeNode( - const AXNode* node, AXNodeData* out_data) const OVERRIDE { + const AXNode* node, AXNodeData* out_data) const override { *out_data = node->data(); } diff --git a/ui/accessibility/ax_tree_unittest.cc b/ui/accessibility/ax_tree_unittest.cc index 05369de..3edd308 100644 --- a/ui/accessibility/ax_tree_unittest.cc +++ b/ui/accessibility/ax_tree_unittest.cc @@ -16,27 +16,27 @@ namespace { class FakeAXTreeDelegate : public AXTreeDelegate { public: - virtual void OnNodeWillBeDeleted(AXNode* node) OVERRIDE { + virtual void OnNodeWillBeDeleted(AXNode* node) override { deleted_ids_.push_back(node->id()); } - virtual void OnNodeCreated(AXNode* node) OVERRIDE { + virtual void OnNodeCreated(AXNode* node) override { created_ids_.push_back(node->id()); } - virtual void OnNodeChanged(AXNode* node) OVERRIDE { + virtual void OnNodeChanged(AXNode* node) override { changed_ids_.push_back(node->id()); } - virtual void OnNodeCreationFinished(AXNode* node) OVERRIDE { + virtual void OnNodeCreationFinished(AXNode* node) override { creation_finished_ids_.push_back(node->id()); } - virtual void OnNodeChangeFinished(AXNode* node) OVERRIDE { + virtual void OnNodeChangeFinished(AXNode* node) override { change_finished_ids_.push_back(node->id()); } - virtual void OnRootChanged(AXNode* new_root) OVERRIDE { + virtual void OnRootChanged(AXNode* new_root) override { new_root_ids_.push_back(new_root->id()); } diff --git a/ui/accessibility/platform/ax_platform_node_base.h b/ui/accessibility/platform/ax_platform_node_base.h index 306f5ab..437b158 100644 --- a/ui/accessibility/platform/ax_platform_node_base.h +++ b/ui/accessibility/platform/ax_platform_node_base.h @@ -26,8 +26,8 @@ class AXPlatformNodeBase : public AXPlatformNode { gfx::NativeViewAccessible ChildAtIndex(int index); // AXPlatformNode - virtual void Destroy() OVERRIDE; - virtual gfx::NativeViewAccessible GetNativeViewAccessible() OVERRIDE; + virtual void Destroy() override; + virtual gfx::NativeViewAccessible GetNativeViewAccessible() override; protected: AXPlatformNodeBase(); diff --git a/ui/accessibility/platform/ax_platform_node_mac.h b/ui/accessibility/platform/ax_platform_node_mac.h index 4303de3..2f15120 100644 --- a/ui/accessibility/platform/ax_platform_node_mac.h +++ b/ui/accessibility/platform/ax_platform_node_mac.h @@ -18,8 +18,8 @@ class AXPlatformNodeMac : public AXPlatformNodeBase { AXPlatformNodeMac(); // AXPlatformNode. - virtual void Destroy() OVERRIDE; - virtual gfx::NativeViewAccessible GetNativeViewAccessible() OVERRIDE; + virtual void Destroy() override; + virtual gfx::NativeViewAccessible GetNativeViewAccessible() override; private: virtual ~AXPlatformNodeMac(); diff --git a/ui/app_list/app_list_folder_item.cc b/ui/app_list/app_list_folder_item.cc index 99d9c19..3c5634d 100644 --- a/ui/app_list/app_list_folder_item.cc +++ b/ui/app_list/app_list_folder_item.cc @@ -47,7 +47,7 @@ class FolderImageSource : public gfx::CanvasImageSource { } // gfx::CanvasImageSource overrides: - virtual void Draw(gfx::Canvas* canvas) OVERRIDE { + virtual void Draw(gfx::Canvas* canvas) override { // Draw folder circle. gfx::Point center = gfx::Point(size().width() / 2 , size().height() / 2); SkPaint paint; diff --git a/ui/app_list/app_list_folder_item.h b/ui/app_list/app_list_folder_item.h index 2f054cc..bfcb86ec 100644 --- a/ui/app_list/app_list_folder_item.h +++ b/ui/app_list/app_list_folder_item.h @@ -59,13 +59,13 @@ class APP_LIST_EXPORT AppListFolderItem : public AppListItem, FolderType folder_type() const { return folder_type_; } // AppListItem - virtual void Activate(int event_flags) OVERRIDE; - virtual const char* GetItemType() const OVERRIDE; - virtual ui::MenuModel* GetContextMenuModel() OVERRIDE; - virtual AppListItem* FindChildItem(const std::string& id) OVERRIDE; - virtual size_t ChildItemCount() const OVERRIDE; - virtual void OnExtensionPreferenceChanged() OVERRIDE; - virtual bool CompareForTest(const AppListItem* other) const OVERRIDE; + virtual void Activate(int event_flags) override; + virtual const char* GetItemType() const override; + virtual ui::MenuModel* GetContextMenuModel() override; + virtual AppListItem* FindChildItem(const std::string& id) override; + virtual size_t ChildItemCount() const override; + virtual void OnExtensionPreferenceChanged() override; + virtual bool CompareForTest(const AppListItem* other) const override; // Calculates the top item icons' bounds inside |folder_icon_bounds|. // Returns the bounds of top item icons in sequence of top left, top right, @@ -77,15 +77,15 @@ class APP_LIST_EXPORT AppListFolderItem : public AppListItem, private: // AppListItemObserver - virtual void ItemIconChanged() OVERRIDE; + virtual void ItemIconChanged() override; // AppListItemListObserver - virtual void OnListItemAdded(size_t index, AppListItem* item) OVERRIDE; + virtual void OnListItemAdded(size_t index, AppListItem* item) override; virtual void OnListItemRemoved(size_t index, - AppListItem* item) OVERRIDE;; + AppListItem* item) override;; virtual void OnListItemMoved(size_t from_index, size_t to_index, - AppListItem* item) OVERRIDE; + AppListItem* item) override; void UpdateTopItems(); diff --git a/ui/app_list/app_list_item_list_unittest.cc b/ui/app_list/app_list_item_list_unittest.cc index de18b6a..9b68ea4 100644 --- a/ui/app_list/app_list_item_list_unittest.cc +++ b/ui/app_list/app_list_item_list_unittest.cc @@ -23,17 +23,17 @@ class TestObserver : public AppListItemListObserver { } // AppListItemListObserver overriden: - virtual void OnListItemAdded(size_t index, AppListItem* item) OVERRIDE { + virtual void OnListItemAdded(size_t index, AppListItem* item) override { ++items_added_; } - virtual void OnListItemRemoved(size_t index, AppListItem* item) OVERRIDE { + virtual void OnListItemRemoved(size_t index, AppListItem* item) override { ++items_removed_; } virtual void OnListItemMoved(size_t from_index, size_t to_index, - AppListItem* item) OVERRIDE { + AppListItem* item) override { ++items_moved_; } @@ -67,11 +67,11 @@ class AppListItemListTest : public testing::Test { virtual ~AppListItemListTest() {} // testing::Test overrides: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { item_list_.AddObserver(&observer_); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { item_list_.RemoveObserver(&observer_); } diff --git a/ui/app_list/app_list_menu.h b/ui/app_list/app_list_menu.h index 6520e1d..738ab1e 100644 --- a/ui/app_list/app_list_menu.h +++ b/ui/app_list/app_list_menu.h @@ -32,12 +32,12 @@ class AppListMenu : public ui::SimpleMenuModel::Delegate { private: void InitMenu(); - virtual bool IsCommandIdChecked(int command_id) const OVERRIDE; - virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE; + virtual bool IsCommandIdChecked(int command_id) const override; + virtual bool IsCommandIdEnabled(int command_id) const override; virtual bool GetAcceleratorForCommandId( int command_id, - ui::Accelerator* accelerator) OVERRIDE; - virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE; + ui::Accelerator* accelerator) override; + virtual void ExecuteCommand(int command_id, int event_flags) override; ui::SimpleMenuModel menu_model_; AppListViewDelegate* delegate_; diff --git a/ui/app_list/app_list_model.h b/ui/app_list/app_list_model.h index 07ab33c..81c9854 100644 --- a/ui/app_list/app_list_model.h +++ b/ui/app_list/app_list_model.h @@ -135,7 +135,7 @@ class APP_LIST_EXPORT AppListModel : public AppListItemListObserver { // AppListItemListObserver virtual void OnListItemMoved(size_t from_index, size_t to_index, - AppListItem* item) OVERRIDE; + AppListItem* item) override; // Returns an existing folder matching |folder_id| or creates a new folder. AppListFolderItem* FindOrCreateFolderItem(const std::string& folder_id); diff --git a/ui/app_list/app_list_model_unittest.cc b/ui/app_list/app_list_model_unittest.cc index 05dbfbb..91d744e 100644 --- a/ui/app_list/app_list_model_unittest.cc +++ b/ui/app_list/app_list_model_unittest.cc @@ -33,19 +33,19 @@ class TestObserver : public AppListModelObserver { } // AppListModelObserver - virtual void OnAppListModelStatusChanged() OVERRIDE { + virtual void OnAppListModelStatusChanged() override { ++status_changed_count_; } - virtual void OnAppListItemAdded(AppListItem* item) OVERRIDE { + virtual void OnAppListItemAdded(AppListItem* item) override { items_added_++; } - virtual void OnAppListItemWillBeDeleted(AppListItem* item) OVERRIDE { + virtual void OnAppListItemWillBeDeleted(AppListItem* item) override { items_removed_++; } - virtual void OnAppListItemUpdated(AppListItem* item) OVERRIDE { + virtual void OnAppListItemUpdated(AppListItem* item) override { items_updated_++; } @@ -78,10 +78,10 @@ class AppListModelTest : public testing::Test { virtual ~AppListModelTest() {} // testing::Test overrides: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { model_.AddObserver(&observer_); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { model_.RemoveObserver(&observer_); } @@ -237,10 +237,10 @@ class AppListModelFolderTest : public AppListModelTest { virtual ~AppListModelFolderTest() {} // testing::Test overrides: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { AppListModelTest::SetUp(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { AppListModelTest::TearDown(); } diff --git a/ui/app_list/cocoa/app_list_view_controller.mm b/ui/app_list/cocoa/app_list_view_controller.mm index b831f9a..c55576a 100644 --- a/ui/app_list/cocoa/app_list_view_controller.mm +++ b/ui/app_list/cocoa/app_list_view_controller.mm @@ -87,8 +87,8 @@ class AppListModelObserverBridge : public AppListViewDelegateObserver { private: // Overridden from app_list::AppListViewDelegateObserver: - virtual void OnProfilesChanged() OVERRIDE; - virtual void OnShutdown() OVERRIDE; + virtual void OnProfilesChanged() override; + virtual void OnShutdown() override; AppListViewController* parent_; // Weak. Owns us. diff --git a/ui/app_list/cocoa/app_list_view_controller_unittest.mm b/ui/app_list/cocoa/app_list_view_controller_unittest.mm index 47d99b5..3b28651 100644 --- a/ui/app_list/cocoa/app_list_view_controller_unittest.mm +++ b/ui/app_list/cocoa/app_list_view_controller_unittest.mm @@ -17,7 +17,7 @@ class AppListViewControllerTest : public AppsGridControllerTestHelper { public: AppListViewControllerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { app_list_view_controller_.reset([[AppListViewController alloc] init]); delegate_.reset(new AppListTestViewDelegate); [app_list_view_controller_ setDelegate:delegate_.get()]; @@ -25,7 +25,7 @@ class AppListViewControllerTest : public AppsGridControllerTestHelper { [[test_window() contentView] addSubview:[app_list_view_controller_ view]]; } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { [app_list_view_controller_ setDelegate:NULL]; app_list_view_controller_.reset(); AppsGridControllerTestHelper::TearDown(); diff --git a/ui/app_list/cocoa/app_list_window_controller_unittest.mm b/ui/app_list/cocoa/app_list_window_controller_unittest.mm index 692f23c..03b74b4 100644 --- a/ui/app_list/cocoa/app_list_window_controller_unittest.mm +++ b/ui/app_list/cocoa/app_list_window_controller_unittest.mm @@ -19,7 +19,7 @@ class AppListWindowControllerTest : public ui::CocoaTest { AppListWindowControllerTest(); protected: - virtual void TearDown() OVERRIDE; + virtual void TearDown() override; base::scoped_nsobject<AppListWindowController> controller_; diff --git a/ui/app_list/cocoa/apps_grid_controller.mm b/ui/app_list/cocoa/apps_grid_controller.mm index f2df08d..e018e2c 100644 --- a/ui/app_list/cocoa/apps_grid_controller.mm +++ b/ui/app_list/cocoa/apps_grid_controller.mm @@ -98,16 +98,16 @@ class AppsGridDelegateBridge : public AppListItemListObserver { private: // Overridden from AppListItemListObserver: - virtual void OnListItemAdded(size_t index, AppListItem* item) OVERRIDE { + virtual void OnListItemAdded(size_t index, AppListItem* item) override { [parent_ listItemAdded:index item:item]; } - virtual void OnListItemRemoved(size_t index, AppListItem* item) OVERRIDE { + virtual void OnListItemRemoved(size_t index, AppListItem* item) override { [parent_ listItemRemoved:index]; } virtual void OnListItemMoved(size_t from_index, size_t to_index, - AppListItem* item) OVERRIDE { + AppListItem* item) override { [parent_ listItemMovedFromIndex:from_index toModelIndex:to_index]; } diff --git a/ui/app_list/cocoa/apps_grid_controller_unittest.mm b/ui/app_list/cocoa/apps_grid_controller_unittest.mm index 756bb3f..2723143f 100644 --- a/ui/app_list/cocoa/apps_grid_controller_unittest.mm +++ b/ui/app_list/cocoa/apps_grid_controller_unittest.mm @@ -96,7 +96,7 @@ class AppsGridControllerTest : public AppsGridControllerTestHelper { return [attributes objectForKey:NSForegroundColorAttributeName]; } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { owned_apps_grid_controller_.reset([[AppsGridController alloc] init]); owned_delegate_.reset(new AppListTestViewDelegate); [owned_apps_grid_controller_ setDelegate:owned_delegate_.get()]; @@ -108,7 +108,7 @@ class AppsGridControllerTest : public AppsGridControllerTestHelper { [apps_grid_controller_ collectionViewAtPageIndex:0]]; } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { [owned_apps_grid_controller_ setDelegate:NULL]; owned_apps_grid_controller_.reset(); AppsGridControllerTestHelper::TearDown(); @@ -145,7 +145,7 @@ class AppListItemWithMenu : public AppListItem { menu_ready_ = ready; } - virtual ui::MenuModel* GetContextMenuModel() OVERRIDE { + virtual ui::MenuModel* GetContextMenuModel() override { if (!menu_ready_) return NULL; diff --git a/ui/app_list/cocoa/apps_grid_view_item.mm b/ui/app_list/cocoa/apps_grid_view_item.mm index fc37ff3..d78e08e 100644 --- a/ui/app_list/cocoa/apps_grid_view_item.mm +++ b/ui/app_list/cocoa/apps_grid_view_item.mm @@ -69,10 +69,10 @@ class ItemModelObserverBridge : public app_list::AppListItemObserver { AppListItem* model() { return model_; } NSMenu* GetContextMenu(); - virtual void ItemIconChanged() OVERRIDE; - virtual void ItemNameChanged() OVERRIDE; - virtual void ItemIsInstallingChanged() OVERRIDE; - virtual void ItemPercentDownloadedChanged() OVERRIDE; + virtual void ItemIconChanged() override; + virtual void ItemNameChanged() override; + virtual void ItemIsInstallingChanged() override; + virtual void ItemPercentDownloadedChanged() override; private: AppsGridViewItem* parent_; // Weak. Owns us. diff --git a/ui/app_list/cocoa/apps_search_box_controller.mm b/ui/app_list/cocoa/apps_search_box_controller.mm index 0e5ba2f..81d7c44 100644 --- a/ui/app_list/cocoa/apps_search_box_controller.mm +++ b/ui/app_list/cocoa/apps_search_box_controller.mm @@ -52,11 +52,11 @@ class SearchBoxModelObserverBridge : public SearchBoxModelObserver { void SetSearchText(const base::string16& text); - virtual void IconChanged() OVERRIDE; - virtual void SpeechRecognitionButtonPropChanged() OVERRIDE; - virtual void HintTextChanged() OVERRIDE; - virtual void SelectionModelChanged() OVERRIDE; - virtual void TextChanged() OVERRIDE; + virtual void IconChanged() override; + virtual void SpeechRecognitionButtonPropChanged() override; + virtual void HintTextChanged() override; + virtual void SelectionModelChanged() override; + virtual void TextChanged() override; private: SearchBoxModel* GetModel(); diff --git a/ui/app_list/cocoa/apps_search_box_controller_unittest.mm b/ui/app_list/cocoa/apps_search_box_controller_unittest.mm index 60182f9..285bbdb 100644 --- a/ui/app_list/cocoa/apps_search_box_controller_unittest.mm +++ b/ui/app_list/cocoa/apps_search_box_controller_unittest.mm @@ -88,7 +88,7 @@ class AppsSearchBoxControllerTest : public ui::CocoaTest { Init(); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { apps_search_box_controller_.reset( [[AppsSearchBoxController alloc] initWithFrame: NSMakeRect(0, 0, 400, 100)]); @@ -99,7 +99,7 @@ class AppsSearchBoxControllerTest : public ui::CocoaTest { [[test_window() contentView] addSubview:[apps_search_box_controller_ view]]; } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { [apps_search_box_controller_ setDelegate:nil]; ui::CocoaTest::TearDown(); } diff --git a/ui/app_list/cocoa/apps_search_results_controller_unittest.mm b/ui/app_list/cocoa/apps_search_results_controller_unittest.mm index b6f2f95..bc6d4fc 100644 --- a/ui/app_list/cocoa/apps_search_results_controller_unittest.mm +++ b/ui/app_list/cocoa/apps_search_results_controller_unittest.mm @@ -74,7 +74,7 @@ class SearchResultWithMenu : public TestSearchResult { menu_ready_ = ready; } - virtual ui::MenuModel* GetContextMenuModel() OVERRIDE { + virtual ui::MenuModel* GetContextMenuModel() override { if (!menu_ready_) return NULL; @@ -123,8 +123,8 @@ class AppsSearchResultsControllerTest : public ui::CocoaTest { void ExpectConsistent(); // ui::CocoaTest overrides: - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; protected: base::scoped_nsobject<TestAppsSearchResultsDelegate> delegate_; diff --git a/ui/app_list/cocoa/apps_search_results_model_bridge.h b/ui/app_list/cocoa/apps_search_results_model_bridge.h index 8939d26..70e66b7 100644 --- a/ui/app_list/cocoa/apps_search_results_model_bridge.h +++ b/ui/app_list/cocoa/apps_search_results_model_bridge.h @@ -34,10 +34,10 @@ class AppsSearchResultsModelBridge : public ui::ListModelObserver { void ReloadDataForItems(size_t start, size_t count) const; // Overridden from ui::ListModelObserver: - virtual void ListItemsAdded(size_t start, size_t count) OVERRIDE; - virtual void ListItemsRemoved(size_t start, size_t count) OVERRIDE; - virtual void ListItemMoved(size_t index, size_t target_index) OVERRIDE; - virtual void ListItemsChanged(size_t start, size_t count) OVERRIDE; + virtual void ListItemsAdded(size_t start, size_t count) override; + virtual void ListItemsRemoved(size_t start, size_t count) override; + virtual void ListItemMoved(size_t index, size_t target_index) override; + virtual void ListItemsChanged(size_t start, size_t count) override; AppsSearchResultsController* parent_; // Weak. Owns us. ScopedVector<ItemObserver> item_observers_; diff --git a/ui/app_list/cocoa/apps_search_results_model_bridge.mm b/ui/app_list/cocoa/apps_search_results_model_bridge.mm index 69a3205..26e8091 100644 --- a/ui/app_list/cocoa/apps_search_results_model_bridge.mm +++ b/ui/app_list/cocoa/apps_search_results_model_bridge.mm @@ -43,14 +43,14 @@ class AppsSearchResultsModelBridge::ItemObserver : public SearchResultObserver { } // SearchResultObserver overrides: - virtual void OnIconChanged() OVERRIDE { + virtual void OnIconChanged() override { bridge_->ReloadDataForItems(row_in_view_, 1); } - virtual void OnActionsChanged() OVERRIDE {} - virtual void OnIsInstallingChanged() OVERRIDE {} - virtual void OnPercentDownloadedChanged() OVERRIDE {} - virtual void OnItemInstalled() OVERRIDE {} - virtual void OnItemUninstalled() OVERRIDE; + virtual void OnActionsChanged() override {} + virtual void OnIsInstallingChanged() override {} + virtual void OnPercentDownloadedChanged() override {} + virtual void OnItemInstalled() override {} + virtual void OnItemUninstalled() override; private: AppsSearchResultsModelBridge* bridge_; // Weak. Owns us. diff --git a/ui/app_list/demo/app_list_demo_views.cc b/ui/app_list/demo/app_list_demo_views.cc index 58e939a..b87885a 100644 --- a/ui/app_list/demo/app_list_demo_views.cc +++ b/ui/app_list/demo/app_list_demo_views.cc @@ -39,9 +39,9 @@ class DemoAppListViewDelegate : public app_list::test::AppListTestViewDelegate { app_list::AppListView* InitView(gfx::NativeWindow window_context); // Overridden from AppListViewDelegate: - virtual void Dismiss() OVERRIDE; - virtual void ViewClosing() OVERRIDE; - virtual views::View* CreateStartPageWebView(const gfx::Size& size) OVERRIDE; + virtual void Dismiss() override; + virtual void ViewClosing() override; + virtual views::View* CreateStartPageWebView(const gfx::Size& size) override; private: app_list::AppListView* view_; // Weak. Owns this. diff --git a/ui/app_list/pagination_model.h b/ui/app_list/pagination_model.h index af30230..1447559 100644 --- a/ui/app_list/pagination_model.h +++ b/ui/app_list/pagination_model.h @@ -122,8 +122,8 @@ class APP_LIST_EXPORT PaginationModel : public gfx::AnimationDelegate { void ResetTransitionAnimation(); // gfx::AnimationDelegate overrides: - virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE; - virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE; + virtual void AnimationProgressed(const gfx::Animation* animation) override; + virtual void AnimationEnded(const gfx::Animation* animation) override; int total_pages_; int selected_page_; diff --git a/ui/app_list/pagination_model_unittest.cc b/ui/app_list/pagination_model_unittest.cc index 391ed87..ad437cf 100644 --- a/ui/app_list/pagination_model_unittest.cc +++ b/ui/app_list/pagination_model_unittest.cc @@ -61,9 +61,9 @@ class TestPaginationModelObserver : public PaginationModelObserver { } // PaginationModelObserver overrides: - virtual void TotalPagesChanged() OVERRIDE {} + virtual void TotalPagesChanged() override {} virtual void SelectedPageChanged(int old_selected, - int new_selected) OVERRIDE { + int new_selected) override { AppendSelectedPage(new_selected); ++selection_count_; if (expected_page_selection_ && @@ -72,10 +72,10 @@ class TestPaginationModelObserver : public PaginationModelObserver { } } - virtual void TransitionStarted() OVERRIDE { + virtual void TransitionStarted() override { } - virtual void TransitionChanged() OVERRIDE { + virtual void TransitionChanged() override { if (transition_page_ == -1 || model_->transition().target_page == transition_page_) { if (model_->transition().progress == 0) @@ -117,13 +117,13 @@ class PaginationModelTest : public testing::Test { virtual ~PaginationModelTest() {} // testing::Test overrides: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { pagination_.SetTotalPages(5); pagination_.SetTransitionDurations(1, 1); observer_.set_model(&pagination_); pagination_.AddObserver(&observer_); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { pagination_.RemoveObserver(&observer_); observer_.set_model(NULL); } diff --git a/ui/app_list/test/app_list_test_model.h b/ui/app_list/test/app_list_test_model.h index 89e407b..d2a1845 100644 --- a/ui/app_list/test/app_list_test_model.h +++ b/ui/app_list/test/app_list_test_model.h @@ -22,8 +22,8 @@ class AppListTestModel : public AppListModel { public: AppListTestItem(const std::string& id, AppListTestModel* model); virtual ~AppListTestItem(); - virtual void Activate(int event_flags) OVERRIDE; - virtual const char* GetItemType() const OVERRIDE; + virtual void Activate(int event_flags) override; + virtual const char* GetItemType() const override; void SetPosition(const syncer::StringOrdinal& new_position); diff --git a/ui/app_list/test/app_list_test_view_delegate.h b/ui/app_list/test/app_list_test_view_delegate.h index dac12b7..2e307a6 100644 --- a/ui/app_list/test/app_list_test_view_delegate.h +++ b/ui/app_list/test/app_list_test_view_delegate.h @@ -48,43 +48,43 @@ class AppListTestViewDelegate : public AppListViewDelegate { int GetToggleSpeechRecognitionCountAndReset(); // AppListViewDelegate overrides: - virtual bool ForceNativeDesktop() const OVERRIDE; - virtual void SetProfileByPath(const base::FilePath& profile_path) OVERRIDE; - virtual AppListModel* GetModel() OVERRIDE; - virtual SpeechUIModel* GetSpeechUI() OVERRIDE; + virtual bool ForceNativeDesktop() const override; + virtual void SetProfileByPath(const base::FilePath& profile_path) override; + virtual AppListModel* GetModel() override; + virtual SpeechUIModel* GetSpeechUI() override; virtual void GetShortcutPathForApp( const std::string& app_id, - const base::Callback<void(const base::FilePath&)>& callback) OVERRIDE; - virtual void StartSearch() OVERRIDE {} - virtual void StopSearch() OVERRIDE {} + const base::Callback<void(const base::FilePath&)>& callback) override; + virtual void StartSearch() override {} + virtual void StopSearch() override {} virtual void OpenSearchResult(SearchResult* result, bool auto_launch, - int event_flags) OVERRIDE; + int event_flags) override; virtual void InvokeSearchResultAction(SearchResult* result, int action_index, - int event_flags) OVERRIDE {} - virtual base::TimeDelta GetAutoLaunchTimeout() OVERRIDE; - virtual void AutoLaunchCanceled() OVERRIDE; - virtual void ViewInitialized() OVERRIDE {} - virtual void Dismiss() OVERRIDE; - virtual void ViewClosing() OVERRIDE {} - virtual gfx::ImageSkia GetWindowIcon() OVERRIDE; - virtual void OpenSettings() OVERRIDE {} - virtual void OpenHelp() OVERRIDE {} - virtual void OpenFeedback() OVERRIDE {} - virtual void ToggleSpeechRecognition() OVERRIDE; + int event_flags) override {} + virtual base::TimeDelta GetAutoLaunchTimeout() override; + virtual void AutoLaunchCanceled() override; + virtual void ViewInitialized() override {} + virtual void Dismiss() override; + virtual void ViewClosing() override {} + virtual gfx::ImageSkia GetWindowIcon() override; + virtual void OpenSettings() override {} + virtual void OpenHelp() override {} + virtual void OpenFeedback() override {} + virtual void ToggleSpeechRecognition() override; virtual void ShowForProfileByPath( - const base::FilePath& profile_path) OVERRIDE {} + const base::FilePath& profile_path) override {} #if defined(TOOLKIT_VIEWS) - virtual views::View* CreateStartPageWebView(const gfx::Size& size) OVERRIDE; + virtual views::View* CreateStartPageWebView(const gfx::Size& size) override; virtual std::vector<views::View*> CreateCustomPageWebViews( - const gfx::Size& size) OVERRIDE; + const gfx::Size& size) override; #endif - virtual bool IsSpeechRecognitionEnabled() OVERRIDE; - virtual const Users& GetUsers() const OVERRIDE; - virtual bool ShouldCenterWindow() const OVERRIDE; - virtual void AddObserver(AppListViewDelegateObserver* observer) OVERRIDE; - virtual void RemoveObserver(AppListViewDelegateObserver* observer) OVERRIDE; + virtual bool IsSpeechRecognitionEnabled() override; + virtual const Users& GetUsers() const override; + virtual bool ShouldCenterWindow() const override; + virtual void AddObserver(AppListViewDelegateObserver* observer) override; + virtual void RemoveObserver(AppListViewDelegateObserver* observer) override; // Do a bulk replacement of the items in the model. void ReplaceTestModel(int item_count); diff --git a/ui/app_list/test/run_all_unittests.cc b/ui/app_list/test/run_all_unittests.cc index fa3c94b..19f0a0c 100644 --- a/ui/app_list/test/run_all_unittests.cc +++ b/ui/app_list/test/run_all_unittests.cc @@ -23,7 +23,7 @@ class AppListTestSuite : public base::TestSuite { AppListTestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {} protected: - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { #if !defined(OS_MACOSX) gfx::GLSurface::InitializeOneOffForTests(); #endif @@ -35,7 +35,7 @@ class AppListTestSuite : public base::TestSuite { ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path); } - virtual void Shutdown() OVERRIDE { + virtual void Shutdown() override { ui::ResourceBundle::CleanupSharedInstance(); base::TestSuite::Shutdown(); } diff --git a/ui/app_list/views/app_list_background.h b/ui/app_list/views/app_list_background.h index 900e698..c3159a0 100644 --- a/ui/app_list/views/app_list_background.h +++ b/ui/app_list/views/app_list_background.h @@ -26,7 +26,7 @@ class AppListBackground : public views::Background { private: // views::Background overrides: - virtual void Paint(gfx::Canvas* canvas, views::View* view) const OVERRIDE; + virtual void Paint(gfx::Canvas* canvas, views::View* view) const override; const int corner_radius_; const AppListMainView* main_view_; // Owned by views hierarchy. diff --git a/ui/app_list/views/app_list_folder_view.h b/ui/app_list/views/app_list_folder_view.h index 2692578..58a25fb 100644 --- a/ui/app_list/views/app_list_folder_view.h +++ b/ui/app_list/views/app_list_folder_view.h @@ -58,15 +58,15 @@ class AppListFolderView : public views::View, void CloseFolderPage(); // views::View - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual void Layout() OVERRIDE; - virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual void Layout() override; + virtual bool OnKeyPressed(const ui::KeyEvent& event) override; // AppListModelObserver - virtual void OnAppListItemWillBeDeleted(AppListItem* item) OVERRIDE; + virtual void OnAppListItemWillBeDeleted(AppListItem* item) override; // ui::ImplicitAnimationObserver - virtual void OnImplicitAnimationsCompleted() OVERRIDE; + virtual void OnImplicitAnimationsCompleted() override; AppsGridView* items_grid_view() { return items_grid_view_; } @@ -81,29 +81,29 @@ class AppListFolderView : public views::View, const gfx::Point& drag_point_in_root_grid); // Overridden from views::View: - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; + virtual void GetAccessibleState(ui::AXViewState* state) override; // Overridden from FolderHeaderViewDelegate: virtual void NavigateBack(AppListFolderItem* item, - const ui::Event& event_flags) OVERRIDE; - virtual void GiveBackFocusToSearchBox() OVERRIDE; + const ui::Event& event_flags) override; + virtual void GiveBackFocusToSearchBox() override; virtual void SetItemName(AppListFolderItem* item, - const std::string& name) OVERRIDE; + const std::string& name) override; // Overridden from AppsGridViewFolderDelegate: - virtual void UpdateFolderViewBackground(bool show_bubble) OVERRIDE; + virtual void UpdateFolderViewBackground(bool show_bubble) override; virtual void ReparentItem(AppListItemView* original_drag_view, const gfx::Point& drag_point_in_folder_grid) - OVERRIDE; + override; virtual void DispatchDragEventForReparent( AppsGridView::Pointer pointer, - const gfx::Point& drag_point_in_folder_grid) OVERRIDE; + const gfx::Point& drag_point_in_folder_grid) override; virtual void DispatchEndDragEventForReparent( bool events_forwarded_to_drag_drop_host, - bool cancel_drag) OVERRIDE; - virtual bool IsPointOutsideOfFolderBoundary(const gfx::Point& point) OVERRIDE; - virtual bool IsOEMFolder() const OVERRIDE; - virtual void SetRootLevelDragViewVisible(bool visible) OVERRIDE; + bool cancel_drag) override; + virtual bool IsPointOutsideOfFolderBoundary(const gfx::Point& point) override; + virtual bool IsOEMFolder() const override; + virtual void SetRootLevelDragViewVisible(bool visible) override; AppsContainerView* container_view_; // Not owned. AppListMainView* app_list_main_view_; // Not Owned. diff --git a/ui/app_list/views/app_list_item_view.h b/ui/app_list/views/app_list_item_view.h index 8c7945b..8328969 100644 --- a/ui/app_list/views/app_list_item_view.h +++ b/ui/app_list/views/app_list_item_view.h @@ -107,36 +107,36 @@ class APP_LIST_EXPORT AppListItemView : public views::CustomButton, void SetTitleSubpixelAA(); // views::View overrides: - virtual const char* GetClassName() const OVERRIDE; - virtual void Layout() OVERRIDE; - virtual void SchedulePaintInRect(const gfx::Rect& r) OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + virtual const char* GetClassName() const override; + virtual void Layout() override; + virtual void SchedulePaintInRect(const gfx::Rect& r) override; + virtual void OnPaint(gfx::Canvas* canvas) override; // views::ContextMenuController overrides: virtual void ShowContextMenuForView(views::View* source, const gfx::Point& point, - ui::MenuSourceType source_type) OVERRIDE; + ui::MenuSourceType source_type) override; // views::CustomButton overrides: - virtual void StateChanged() OVERRIDE; - virtual bool ShouldEnterPushedState(const ui::Event& event) OVERRIDE; + virtual void StateChanged() override; + virtual bool ShouldEnterPushedState(const ui::Event& event) override; // views::View overrides: - virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE; - virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseCaptureLost() OVERRIDE; - virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE; + virtual bool OnKeyPressed(const ui::KeyEvent& event) override; + virtual bool OnMousePressed(const ui::MouseEvent& event) override; + virtual void OnMouseReleased(const ui::MouseEvent& event) override; + virtual void OnMouseCaptureLost() override; + virtual bool OnMouseDragged(const ui::MouseEvent& event) override; // ui::EventHandler overrides: - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; + virtual void OnGestureEvent(ui::GestureEvent* event) override; // AppListItemObserver overrides: - virtual void ItemIconChanged() OVERRIDE; - virtual void ItemNameChanged() OVERRIDE; - virtual void ItemIsInstallingChanged() OVERRIDE; - virtual void ItemPercentDownloadedChanged() OVERRIDE; - virtual void ItemBeingDestroyed() OVERRIDE; + virtual void ItemIconChanged() override; + virtual void ItemNameChanged() override; + virtual void ItemIsInstallingChanged() override; + virtual void ItemPercentDownloadedChanged() override; + virtual void ItemBeingDestroyed() override; const bool is_folder_; const bool is_in_folder_; diff --git a/ui/app_list/views/app_list_main_view.cc b/ui/app_list/views/app_list_main_view.cc index 4404d35..b7e08b1 100644 --- a/ui/app_list/views/app_list_main_view.cc +++ b/ui/app_list/views/app_list_main_view.cc @@ -57,7 +57,7 @@ class SearchBoxContainerView : public views::View { private: // Overridden from views::View: - virtual void ChildVisibilityChanged(views::View* child) OVERRIDE { + virtual void ChildVisibilityChanged(views::View* child) override { DCHECK_EQ(search_box_, child); host_->NotifySearchBoxVisibilityChanged(); } @@ -92,7 +92,7 @@ class AppListMainView::IconLoader : public AppListItemObserver { private: // AppListItemObserver overrides: - virtual void ItemIconChanged() OVERRIDE { + virtual void ItemIconChanged() override { owner_->OnItemIconLoaded(this); // Note that IconLoader is released here. } diff --git a/ui/app_list/views/app_list_main_view.h b/ui/app_list/views/app_list_main_view.h index b45559d..2abe961 100644 --- a/ui/app_list/views/app_list_main_view.h +++ b/ui/app_list/views/app_list_main_view.h @@ -97,18 +97,18 @@ class APP_LIST_EXPORT AppListMainView : public views::View, void OnItemIconLoaded(IconLoader* loader); // Overridden from AppsGridViewDelegate: - virtual void ActivateApp(AppListItem* item, int event_flags) OVERRIDE; + virtual void ActivateApp(AppListItem* item, int event_flags) override; virtual void GetShortcutPathForApp( const std::string& app_id, - const base::Callback<void(const base::FilePath&)>& callback) OVERRIDE; - virtual void CancelDragInActiveFolder() OVERRIDE; + const base::Callback<void(const base::FilePath&)>& callback) override; + virtual void CancelDragInActiveFolder() override; // Overridden from SearchBoxViewDelegate: - virtual void QueryChanged(SearchBoxView* sender) OVERRIDE; + virtual void QueryChanged(SearchBoxView* sender) override; // Overridden from SearchResultListViewDelegate: - virtual void OnResultInstalled(SearchResult* result) OVERRIDE; - virtual void OnResultUninstalled(SearchResult* result) OVERRIDE; + virtual void OnResultInstalled(SearchResult* result) override; + virtual void OnResultUninstalled(SearchResult* result) override; AppListViewDelegate* delegate_; // Owned by parent view (AppListView). AppListModel* model_; // Unowned; ownership is handled by |delegate_|. diff --git a/ui/app_list/views/app_list_main_view_unittest.cc b/ui/app_list/views/app_list_main_view_unittest.cc index f92e041..08cd351 100644 --- a/ui/app_list/views/app_list_main_view_unittest.cc +++ b/ui/app_list/views/app_list_main_view_unittest.cc @@ -69,7 +69,7 @@ class AppListMainViewTest : public views::ViewsTestBase { virtual ~AppListMainViewTest() {} // testing::Test overrides: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { views::ViewsTestBase::SetUp(); delegate_.reset(new AppListTestViewDelegate); @@ -89,7 +89,7 @@ class AppListMainViewTest : public views::ViewsTestBase { widget_->SetContentsView(main_view_); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { widget_->Close(); views::ViewsTestBase::TearDown(); delegate_.reset(); diff --git a/ui/app_list/views/app_list_view.cc b/ui/app_list/views/app_list_view.cc index 2a01e82..c6b8896 100644 --- a/ui/app_list/views/app_list_view.cc +++ b/ui/app_list/views/app_list_view.cc @@ -90,7 +90,7 @@ class AppListOverlayBackground : public views::Background { virtual ~AppListOverlayBackground() {}; // Overridden from views::Background: - virtual void Paint(gfx::Canvas* canvas, views::View* view) const OVERRIDE { + virtual void Paint(gfx::Canvas* canvas, views::View* view) const override { SkPaint paint; paint.setStyle(SkPaint::kFill_Style); paint.setColor(SK_ColorWHITE); @@ -128,7 +128,7 @@ class HideViewAnimationObserver : public ui::ImplicitAnimationObserver { private: // Overridden from ui::ImplicitAnimationObserver: - virtual void OnImplicitAnimationsCompleted() OVERRIDE { + virtual void OnImplicitAnimationsCompleted() override { if (target_) { target_->SetVisible(false); target_ = NULL; diff --git a/ui/app_list/views/app_list_view.h b/ui/app_list/views/app_list_view.h index 0ee715a..c9cd5cf3 100644 --- a/ui/app_list/views/app_list_view.h +++ b/ui/app_list/views/app_list_view.h @@ -90,17 +90,17 @@ class APP_LIST_EXPORT AppListView : public views::BubbleDelegateView, bool ShouldCenterWindow() const; // Overridden from views::View: - virtual gfx::Size GetPreferredSize() const OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; virtual void Paint(gfx::Canvas* canvas, - const views::CullSet& cull_set) OVERRIDE; - virtual void OnThemeChanged() OVERRIDE; + const views::CullSet& cull_set) override; + virtual void OnThemeChanged() override; // WidgetDelegate overrides: - virtual bool ShouldHandleSystemCommands() const OVERRIDE; + virtual bool ShouldHandleSystemCommands() const override; // Overridden from AppListViewDelegateObserver: - virtual void OnProfilesChanged() OVERRIDE; - virtual void OnShutdown() OVERRIDE; + virtual void OnProfilesChanged() override; + virtual void OnShutdown() override; void Prerender(); @@ -133,29 +133,29 @@ class APP_LIST_EXPORT AppListView : public views::BubbleDelegateView, // Overridden from views::BubbleDelegateView: virtual void OnBeforeBubbleWidgetInit( views::Widget::InitParams* params, - views::Widget* widget) const OVERRIDE; + views::Widget* widget) const override; // Overridden from views::WidgetDelegateView: - virtual views::View* GetInitiallyFocusedView() OVERRIDE; - virtual gfx::ImageSkia GetWindowIcon() OVERRIDE; - virtual bool WidgetHasHitTestMask() const OVERRIDE; - virtual void GetWidgetHitTestMask(gfx::Path* mask) const OVERRIDE; + virtual views::View* GetInitiallyFocusedView() override; + virtual gfx::ImageSkia GetWindowIcon() override; + virtual bool WidgetHasHitTestMask() const override; + virtual void GetWidgetHitTestMask(gfx::Path* mask) const override; // Overridden from views::View: - virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; - virtual void Layout() OVERRIDE; - virtual void SchedulePaintInRect(const gfx::Rect& rect) OVERRIDE; + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) override; + virtual void Layout() override; + virtual void SchedulePaintInRect(const gfx::Rect& rect) override; // Overridden from views::WidgetObserver: - virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE; + virtual void OnWidgetDestroying(views::Widget* widget) override; virtual void OnWidgetVisibilityChanged( - views::Widget* widget, bool visible) OVERRIDE; + views::Widget* widget, bool visible) override; virtual void OnWidgetActivationChanged( - views::Widget* widget, bool active) OVERRIDE; + views::Widget* widget, bool active) override; // Overridden from SpeechUIModelObserver: virtual void OnSpeechRecognitionStateChanged( - SpeechRecognitionState new_state) OVERRIDE; + SpeechRecognitionState new_state) override; AppListViewDelegate* delegate_; // Weak. Owned by AppListService. diff --git a/ui/app_list/views/app_list_view_unittest.cc b/ui/app_list/views/app_list_view_unittest.cc index 29428ea..2ee50d4 100644 --- a/ui/app_list/views/app_list_view_unittest.cc +++ b/ui/app_list/views/app_list_view_unittest.cc @@ -144,12 +144,12 @@ class UnitTestViewDelegate : public app_list::test::AppListTestViewDelegate { UnitTestViewDelegate(AppListViewTestContext* parent) : parent_(parent) {} // Overridden from app_list::AppListViewDelegate: - virtual bool ShouldCenterWindow() const OVERRIDE { + virtual bool ShouldCenterWindow() const override { return app_list::switches::IsCenteredAppListEnabled(); } // Overridden from app_list::test::AppListTestViewDelegate: - virtual void ViewClosing() OVERRIDE { parent_->NativeWidgetClosing(); } + virtual void ViewClosing() override { parent_->NativeWidgetClosing(); } private: AppListViewTestContext* parent_; @@ -563,7 +563,7 @@ class AppListViewTestAura : public views::ViewsTestBase, virtual ~AppListViewTestAura() {} // testing::Test overrides: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { views::ViewsTestBase::SetUp(); // On Ash (only) the app list is placed into an aura::Window "container", @@ -578,7 +578,7 @@ class AppListViewTestAura : public views::ViewsTestBase, test_context_.reset(new AppListViewTestContext(GetParam(), container)); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { test_context_.reset(); views::ViewsTestBase::TearDown(); } @@ -597,13 +597,13 @@ class AppListViewTestDesktop : public views::ViewsTestBase, virtual ~AppListViewTestDesktop() {} // testing::Test overrides: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { set_views_delegate(new AppListViewTestViewsDelegate(this)); views::ViewsTestBase::SetUp(); test_context_.reset(new AppListViewTestContext(GetParam(), NULL)); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { test_context_.reset(); views::ViewsTestBase::TearDown(); } @@ -620,7 +620,7 @@ class AppListViewTestDesktop : public views::ViewsTestBase, // Overridden from views::ViewsDelegate: virtual void OnBeforeWidgetInit( views::Widget::InitParams* params, - views::internal::NativeWidgetDelegate* delegate) OVERRIDE; + views::internal::NativeWidgetDelegate* delegate) override; private: AppListViewTestDesktop* parent_; diff --git a/ui/app_list/views/apps_container_view.h b/ui/app_list/views/apps_container_view.h index 3278385f..895d2e4 100644 --- a/ui/app_list/views/apps_container_view.h +++ b/ui/app_list/views/apps_container_view.h @@ -58,12 +58,12 @@ class AppsContainerView : public views::View, bool IsInFolderView() const; // views::View overrides: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual void Layout() OVERRIDE; - virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual void Layout() override; + virtual bool OnKeyPressed(const ui::KeyEvent& event) override; // TopIconAnimationObserver overrides: - virtual void OnTopIconAnimationsComplete() OVERRIDE; + virtual void OnTopIconAnimationsComplete() override; AppsGridView* apps_grid_view() { return apps_grid_view_; } FolderBackgroundView* folder_background_view() { diff --git a/ui/app_list/views/apps_grid_view.cc b/ui/app_list/views/apps_grid_view.cc index 53b365d..1c24bf5 100644 --- a/ui/app_list/views/apps_grid_view.cc +++ b/ui/app_list/views/apps_grid_view.cc @@ -137,7 +137,7 @@ class RowMoveAnimationDelegate : public gfx::AnimationDelegate { virtual ~RowMoveAnimationDelegate() {} // gfx::AnimationDelegate overrides: - virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE { + virtual void AnimationProgressed(const gfx::Animation* animation) override { view_->layer()->SetOpacity(animation->GetCurrentValue()); view_->layer()->ScheduleDraw(); @@ -148,11 +148,11 @@ class RowMoveAnimationDelegate : public gfx::AnimationDelegate { layer_->ScheduleDraw(); } } - virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE { + virtual void AnimationEnded(const gfx::Animation* animation) override { view_->layer()->SetOpacity(1.0f); view_->SchedulePaint(); } - virtual void AnimationCanceled(const gfx::Animation* animation) OVERRIDE { + virtual void AnimationCanceled(const gfx::Animation* animation) override { view_->layer()->SetOpacity(1.0f); view_->SchedulePaint(); } @@ -181,7 +181,7 @@ class ItemRemoveAnimationDelegate : public gfx::AnimationDelegate { } // gfx::AnimationDelegate overrides: - virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE { + virtual void AnimationProgressed(const gfx::Animation* animation) override { view_->layer()->SetOpacity(1 - animation->GetCurrentValue()); view_->layer()->ScheduleDraw(); } @@ -199,10 +199,10 @@ class ItemMoveAnimationDelegate : public gfx::AnimationDelegate { public: ItemMoveAnimationDelegate(views::View* view) : view_(view) {} - virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE { + virtual void AnimationEnded(const gfx::Animation* animation) override { view_->SchedulePaint(); } - virtual void AnimationCanceled(const gfx::Animation* animation) OVERRIDE { + virtual void AnimationCanceled(const gfx::Animation* animation) override { view_->SchedulePaint(); } @@ -301,14 +301,14 @@ class SynchronousDrag : public ui::DragSourceWin { private: // Overridden from ui::DragSourceWin. - virtual void OnDragSourceCancel() OVERRIDE { + virtual void OnDragSourceCancel() override { canceled_ = true; } - virtual void OnDragSourceDrop() OVERRIDE { + virtual void OnDragSourceDrop() override { } - virtual void OnDragSourceMove() OVERRIDE { + virtual void OnDragSourceMove() override { grid_view_->UpdateDrag(AppsGridView::MOUSE, GetCursorInGridViewCoords()); } diff --git a/ui/app_list/views/apps_grid_view.h b/ui/app_list/views/apps_grid_view.h index 08a11f6..3a395cb 100644 --- a/ui/app_list/views/apps_grid_view.h +++ b/ui/app_list/views/apps_grid_view.h @@ -127,22 +127,22 @@ class APP_LIST_EXPORT AppsGridView : public views::View, PaginationModel* pagination_model() { return &pagination_model_; } // Overridden from views::View: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual void Layout() OVERRIDE; - virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE; - virtual bool OnKeyReleased(const ui::KeyEvent& event) OVERRIDE; - virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual void Layout() override; + virtual bool OnKeyPressed(const ui::KeyEvent& event) override; + virtual bool OnKeyReleased(const ui::KeyEvent& event) override; + virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) override; virtual void ViewHierarchyChanged( - const ViewHierarchyChangedDetails& details) OVERRIDE; + const ViewHierarchyChangedDetails& details) override; virtual bool GetDropFormats( int* formats, - std::set<OSExchangeData::CustomFormat>* custom_formats) OVERRIDE; - virtual bool CanDrop(const OSExchangeData& data) OVERRIDE; - virtual int OnDragUpdated(const ui::DropTargetEvent& event) OVERRIDE; + std::set<OSExchangeData::CustomFormat>* custom_formats) override; + virtual bool CanDrop(const OSExchangeData& data) override; + virtual int OnDragUpdated(const ui::DropTargetEvent& event) override; // Overridden from ui::EventHandler: - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; - virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE; + virtual void OnGestureEvent(ui::GestureEvent* event) override; + virtual void OnScrollEvent(ui::ScrollEvent* event) override; // Stops the timer that triggers a page flip during a drag. void StopPageFlipTimer(); @@ -369,27 +369,27 @@ class APP_LIST_EXPORT AppsGridView : public views::View, // Overridden from views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) OVERRIDE; + const ui::Event& event) override; // Overridden from AppListItemListObserver: - virtual void OnListItemAdded(size_t index, AppListItem* item) OVERRIDE; - virtual void OnListItemRemoved(size_t index, AppListItem* item) OVERRIDE; + virtual void OnListItemAdded(size_t index, AppListItem* item) override; + virtual void OnListItemRemoved(size_t index, AppListItem* item) override; virtual void OnListItemMoved(size_t from_index, size_t to_index, - AppListItem* item) OVERRIDE; - virtual void OnAppListItemHighlight(size_t index, bool highlight) OVERRIDE; + AppListItem* item) override; + virtual void OnAppListItemHighlight(size_t index, bool highlight) override; // Overridden from PaginationModelObserver: - virtual void TotalPagesChanged() OVERRIDE; - virtual void SelectedPageChanged(int old_selected, int new_selected) OVERRIDE; - virtual void TransitionStarted() OVERRIDE; - virtual void TransitionChanged() OVERRIDE; + virtual void TotalPagesChanged() override; + virtual void SelectedPageChanged(int old_selected, int new_selected) override; + virtual void TransitionStarted() override; + virtual void TransitionChanged() override; // Overridden from AppListModelObserver: - virtual void OnAppListModelStatusChanged() OVERRIDE; + virtual void OnAppListModelStatusChanged() override; // ui::ImplicitAnimationObserver overrides: - virtual void OnImplicitAnimationsCompleted() OVERRIDE; + virtual void OnImplicitAnimationsCompleted() override; // Hide a given view temporarily without losing (mouse) events and / or // changing the size of it. If |immediate| is set the change will be diff --git a/ui/app_list/views/apps_grid_view_unittest.cc b/ui/app_list/views/apps_grid_view_unittest.cc index b9cc401..492b233 100644 --- a/ui/app_list/views/apps_grid_view_unittest.cc +++ b/ui/app_list/views/apps_grid_view_unittest.cc @@ -63,10 +63,10 @@ class PageFlipWaiter : public PaginationModelObserver { private: // PaginationModelObserver overrides: - virtual void TotalPagesChanged() OVERRIDE { + virtual void TotalPagesChanged() override { } virtual void SelectedPageChanged(int old_selected, - int new_selected) OVERRIDE { + int new_selected) override { if (!selected_pages_.empty()) selected_pages_ += ','; selected_pages_ += base::IntToString(new_selected); @@ -74,9 +74,9 @@ class PageFlipWaiter : public PaginationModelObserver { if (wait_) ui_loop_->Quit(); } - virtual void TransitionStarted() OVERRIDE { + virtual void TransitionStarted() override { } - virtual void TransitionChanged() OVERRIDE { + virtual void TransitionChanged() override { } base::MessageLoopForUI* ui_loop_; @@ -95,7 +95,7 @@ class AppsGridViewTest : public views::ViewsTestBase { virtual ~AppsGridViewTest() {} // testing::Test overrides: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { views::ViewsTestBase::SetUp(); model_.reset(new AppListTestModel); model_->SetFoldersEnabled(true); @@ -108,7 +108,7 @@ class AppsGridViewTest : public views::ViewsTestBase { test_api_.reset(new AppsGridViewTestApi(apps_grid_view_.get())); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { apps_grid_view_.reset(); // Release apps grid view before models. views::ViewsTestBase::TearDown(); } @@ -189,30 +189,30 @@ class TestAppsGridViewFolderDelegate : public AppsGridViewFolderDelegate { virtual ~TestAppsGridViewFolderDelegate() {} // Overridden from AppsGridViewFolderDelegate: - virtual void UpdateFolderViewBackground(bool show_bubble) OVERRIDE { + virtual void UpdateFolderViewBackground(bool show_bubble) override { show_bubble_ = show_bubble; } virtual void ReparentItem(AppListItemView* original_drag_view, const gfx::Point& drag_point_in_folder_grid) - OVERRIDE {} + override {} virtual void DispatchDragEventForReparent( AppsGridView::Pointer pointer, - const gfx::Point& drag_point_in_folder_grid) OVERRIDE {} + const gfx::Point& drag_point_in_folder_grid) override {} virtual void DispatchEndDragEventForReparent( bool events_forwarded_to_drag_drop_host, - bool cancel_drag) OVERRIDE {} + bool cancel_drag) override {} virtual bool IsPointOutsideOfFolderBoundary(const gfx::Point& point) - OVERRIDE { + override { return false; } - virtual bool IsOEMFolder() const OVERRIDE { return false; } + virtual bool IsOEMFolder() const override { return false; } - virtual void SetRootLevelDragViewVisible(bool visible) OVERRIDE {} + virtual void SetRootLevelDragViewVisible(bool visible) override {} bool show_bubble() { return show_bubble_; } diff --git a/ui/app_list/views/cached_label.h b/ui/app_list/views/cached_label.h index 8b4360a..3120446 100644 --- a/ui/app_list/views/cached_label.h +++ b/ui/app_list/views/cached_label.h @@ -28,11 +28,11 @@ class CachedLabel : public views::Label { #if defined(OS_WIN) // Overridden from views::View: - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + virtual void OnPaint(gfx::Canvas* canvas) override; #endif // Overridden from ui::LayerDelegate: - virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE; + virtual void OnDeviceScaleFactorChanged(float device_scale_factor) override; private: bool needs_repaint_; diff --git a/ui/app_list/views/contents_switcher_view.h b/ui/app_list/views/contents_switcher_view.h index 9c8f67c..c6f2bdf 100644 --- a/ui/app_list/views/contents_switcher_view.h +++ b/ui/app_list/views/contents_switcher_view.h @@ -34,13 +34,13 @@ class ContentsSwitcherView : public views::View, private: // Overridden from views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) OVERRIDE; + const ui::Event& event) override; // Overridden from PaginationModelObserver: - virtual void TotalPagesChanged() OVERRIDE; - virtual void SelectedPageChanged(int old_selected, int new_selected) OVERRIDE; - virtual void TransitionStarted() OVERRIDE; - virtual void TransitionChanged() OVERRIDE; + virtual void TotalPagesChanged() override; + virtual void SelectedPageChanged(int old_selected, int new_selected) override; + virtual void TransitionStarted() override; + virtual void TransitionChanged() override; ContentsView* contents_view_; // Owned by views hierarchy. diff --git a/ui/app_list/views/contents_view.h b/ui/app_list/views/contents_view.h index 092f08d..9546a0e 100644 --- a/ui/app_list/views/contents_view.h +++ b/ui/app_list/views/contents_view.h @@ -102,15 +102,15 @@ class APP_LIST_EXPORT ContentsView : public views::View, void AddBlankPageForTesting(); // Overridden from views::View: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual void Layout() OVERRIDE; - virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual void Layout() override; + virtual bool OnKeyPressed(const ui::KeyEvent& event) override; // Overridden from PaginationModelObserver: - virtual void TotalPagesChanged() OVERRIDE; - virtual void SelectedPageChanged(int old_selected, int new_selected) OVERRIDE; - virtual void TransitionStarted() OVERRIDE; - virtual void TransitionChanged() OVERRIDE; + virtual void TotalPagesChanged() override; + virtual void SelectedPageChanged(int old_selected, int new_selected) override; + virtual void TransitionStarted() override; + virtual void TransitionChanged() override; // Returns the pagination model for the ContentsView. const PaginationModel& pagination_model() { return pagination_model_; } diff --git a/ui/app_list/views/folder_background_view.h b/ui/app_list/views/folder_background_view.h index af4e8cf..dd6c9dd 100644 --- a/ui/app_list/views/folder_background_view.h +++ b/ui/app_list/views/folder_background_view.h @@ -38,10 +38,10 @@ class FolderBackgroundView : public views::View, private: // views::View overrides: - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + virtual void OnPaint(gfx::Canvas* canvas) override; // ui::ImplicitAnimationObserver overrides: - virtual void OnImplicitAnimationsCompleted() OVERRIDE; + virtual void OnImplicitAnimationsCompleted() override; AppListFolderView* folder_view_; ShowState show_state_; diff --git a/ui/app_list/views/folder_header_view.h b/ui/app_list/views/folder_header_view.h index c01b72d..3d1e7b6 100644 --- a/ui/app_list/views/folder_header_view.h +++ b/ui/app_list/views/folder_header_view.h @@ -41,7 +41,7 @@ class APP_LIST_EXPORT FolderHeaderView : public views::View, void OnFolderItemRemoved(); // Overridden from views::View: - virtual gfx::Size GetPreferredSize() const OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; private: class FolderNameView; @@ -61,20 +61,20 @@ class APP_LIST_EXPORT FolderHeaderView : public views::View, bool IsFolderNameEnabledForTest() const; // views::View overrides: - virtual void Layout() OVERRIDE; - virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + virtual void Layout() override; + virtual bool OnKeyPressed(const ui::KeyEvent& event) override; + virtual void OnPaint(gfx::Canvas* canvas) override; // views::TextfieldController overrides: virtual void ContentsChanged(views::Textfield* sender, - const base::string16& new_contents) OVERRIDE; + const base::string16& new_contents) override; // views::ButtonListener overrides: virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) OVERRIDE; + const ui::Event& event) override; // AppListItemObserver overrides: - virtual void ItemNameChanged() OVERRIDE; + virtual void ItemNameChanged() override; AppListFolderItem* folder_item_; // Not owned. diff --git a/ui/app_list/views/folder_header_view_unittest.cc b/ui/app_list/views/folder_header_view_unittest.cc index 34f1984..6408adb 100644 --- a/ui/app_list/views/folder_header_view_unittest.cc +++ b/ui/app_list/views/folder_header_view_unittest.cc @@ -32,12 +32,12 @@ class TestFolderHeaderViewDelegate : public FolderHeaderViewDelegate { // FolderHeaderViewDelegate virtual void NavigateBack(AppListFolderItem* item, - const ui::Event& event_flags) OVERRIDE {} + const ui::Event& event_flags) override {} - virtual void GiveBackFocusToSearchBox() OVERRIDE {} + virtual void GiveBackFocusToSearchBox() override {} virtual void SetItemName(AppListFolderItem* item, - const std::string& name) OVERRIDE { + const std::string& name) override { folder_name_ = name; } @@ -57,7 +57,7 @@ class FolderHeaderViewTest : public views::ViewsTestBase { virtual ~FolderHeaderViewTest() {} // testing::Test overrides: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { views::ViewsTestBase::SetUp(); model_.reset(new AppListTestModel); model_->SetFoldersEnabled(true); @@ -66,7 +66,7 @@ class FolderHeaderViewTest : public views::ViewsTestBase { folder_header_view_.reset(new FolderHeaderView(delegate_.get())); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { folder_header_view_.reset(); // Release apps grid view before models. delegate_.reset(); views::ViewsTestBase::TearDown(); diff --git a/ui/app_list/views/page_switcher.cc b/ui/app_list/views/page_switcher.cc index 84077f9..4ab6d6c 100644 --- a/ui/app_list/views/page_switcher.cc +++ b/ui/app_list/views/page_switcher.cc @@ -49,11 +49,11 @@ class PageSwitcherButton : public views::CustomButton { void set_button_width(int button_width) { button_width_ = button_width; } // Overridden from views::View: - virtual gfx::Size GetPreferredSize() const OVERRIDE { + virtual gfx::Size GetPreferredSize() const override { return gfx::Size(button_width_, kButtonHeight); } - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { + virtual void OnPaint(gfx::Canvas* canvas) override { if (state() == STATE_HOVERED) PaintButton(canvas, kPagerHoverColor); else diff --git a/ui/app_list/views/page_switcher.h b/ui/app_list/views/page_switcher.h index a1ca14a..88807db 100644 --- a/ui/app_list/views/page_switcher.h +++ b/ui/app_list/views/page_switcher.h @@ -34,21 +34,21 @@ class PageSwitcher : public views::View, void UpdateUIForDragPoint(const gfx::Point& point); // Overridden from views::View: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual void Layout() OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual void Layout() override; private: void CalculateButtonWidthAndSpacing(int contents_width); // Overridden from views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) OVERRIDE; + const ui::Event& event) override; // Overridden from PaginationModelObserver: - virtual void TotalPagesChanged() OVERRIDE; - virtual void SelectedPageChanged(int old_selected, int new_selected) OVERRIDE; - virtual void TransitionStarted() OVERRIDE; - virtual void TransitionChanged() OVERRIDE; + virtual void TotalPagesChanged() override; + virtual void SelectedPageChanged(int old_selected, int new_selected) override; + virtual void TransitionStarted() override; + virtual void TransitionChanged() override; PaginationModel* model_; // Owned by AppsGridView. views::View* buttons_; // Owned by views hierarchy. diff --git a/ui/app_list/views/progress_bar_view.h b/ui/app_list/views/progress_bar_view.h index 0e61820..4aaaa63 100644 --- a/ui/app_list/views/progress_bar_view.h +++ b/ui/app_list/views/progress_bar_view.h @@ -22,8 +22,8 @@ class ProgressBarView : public views::ProgressBar { virtual ~ProgressBarView(); // views::View overrides: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual void OnPaint(gfx::Canvas* canvas) override; private: scoped_ptr<views::Painter> background_painter_; diff --git a/ui/app_list/views/pulsing_block_view.h b/ui/app_list/views/pulsing_block_view.h index 22bbec2..f517bc0 100644 --- a/ui/app_list/views/pulsing_block_view.h +++ b/ui/app_list/views/pulsing_block_view.h @@ -28,7 +28,7 @@ class PulsingBlockView : public views::View { void OnStartDelayTimer(); // views::View overrides: - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + virtual void OnPaint(gfx::Canvas* canvas) override; base::OneShotTimer<PulsingBlockView> start_delay_timer_; diff --git a/ui/app_list/views/search_box_view.cc b/ui/app_list/views/search_box_view.cc index 43cb313..6af224c 100644 --- a/ui/app_list/views/search_box_view.cc +++ b/ui/app_list/views/search_box_view.cc @@ -52,7 +52,7 @@ class SearchBoxBackground : public views::Background { private: // views::Background overrides: - virtual void Paint(gfx::Canvas* canvas, views::View* view) const OVERRIDE { + virtual void Paint(gfx::Canvas* canvas, views::View* view) const override { gfx::Rect bounds = view->GetContentsBounds(); SkPaint paint; diff --git a/ui/app_list/views/search_box_view.h b/ui/app_list/views/search_box_view.h index a2e3c8a..ef05438 100644 --- a/ui/app_list/views/search_box_view.h +++ b/ui/app_list/views/search_box_view.h @@ -55,8 +55,8 @@ class APP_LIST_EXPORT SearchBoxView : public views::View, } // Overridden from views::View: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) override; private: // Updates model text and selection model with current Textfield info. @@ -67,28 +67,28 @@ class APP_LIST_EXPORT SearchBoxView : public views::View, // Overridden from views::TextfieldController: virtual void ContentsChanged(views::Textfield* sender, - const base::string16& new_contents) OVERRIDE; + const base::string16& new_contents) override; virtual bool HandleKeyEvent(views::Textfield* sender, - const ui::KeyEvent& key_event) OVERRIDE; + const ui::KeyEvent& key_event) override; // Overridden from views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) OVERRIDE; + const ui::Event& event) override; // Overridden from views::MenuButtonListener: virtual void OnMenuButtonClicked(View* source, - const gfx::Point& point) OVERRIDE; + const gfx::Point& point) override; // Overridden from SearchBoxModelObserver: - virtual void IconChanged() OVERRIDE; - virtual void SpeechRecognitionButtonPropChanged() OVERRIDE; - virtual void HintTextChanged() OVERRIDE; - virtual void SelectionModelChanged() OVERRIDE; - virtual void TextChanged() OVERRIDE; + virtual void IconChanged() override; + virtual void SpeechRecognitionButtonPropChanged() override; + virtual void HintTextChanged() override; + virtual void SelectionModelChanged() override; + virtual void TextChanged() override; // Overridden from SpeechUIModelObserver: virtual void OnSpeechRecognitionStateChanged( - SpeechRecognitionState new_state) OVERRIDE; + SpeechRecognitionState new_state) override; SearchBoxViewDelegate* delegate_; // Not owned. AppListViewDelegate* view_delegate_; // Not owned. diff --git a/ui/app_list/views/search_box_view_unittest.cc b/ui/app_list/views/search_box_view_unittest.cc index cc7354e..a1643a0 100644 --- a/ui/app_list/views/search_box_view_unittest.cc +++ b/ui/app_list/views/search_box_view_unittest.cc @@ -29,7 +29,7 @@ class KeyPressCounterView : public views::View { private: // Overridden from views::View: - virtual bool OnKeyPressed(const ui::KeyEvent& key_event) OVERRIDE { + virtual bool OnKeyPressed(const ui::KeyEvent& key_event) override { if (!::isalnum(static_cast<int>(key_event.key_code()))) { ++count_; return true; @@ -48,7 +48,7 @@ class SearchBoxViewTest : public views::test::WidgetTest, virtual ~SearchBoxViewTest() {} // Overridden from testing::Test: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { views::test::WidgetTest::SetUp(); widget_ = CreateTopLevelPlatformWidget(); view_ = new SearchBoxView(this, &view_delegate_); @@ -58,7 +58,7 @@ class SearchBoxViewTest : public views::test::WidgetTest, view_->set_contents_view(counter_view_); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { widget_->CloseNow(); views::test::WidgetTest::TearDown(); } @@ -107,7 +107,7 @@ class SearchBoxViewTest : public views::test::WidgetTest, private: // Overridden from SearchBoxViewDelegate: - virtual void QueryChanged(SearchBoxView* sender) OVERRIDE { + virtual void QueryChanged(SearchBoxView* sender) override { ++query_changed_count_; last_query_ = sender->search_box()->text(); } diff --git a/ui/app_list/views/search_result_actions_view.h b/ui/app_list/views/search_result_actions_view.h index 7e5fa75..bb11a8b 100644 --- a/ui/app_list/views/search_result_actions_view.h +++ b/ui/app_list/views/search_result_actions_view.h @@ -34,11 +34,11 @@ class SearchResultActionsView : public views::View, void CreateBlueButton(const SearchResult::Action& action); // views::View overrides: - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + virtual void OnPaint(gfx::Canvas* canvas) override; // views::ButtonListener overrides: virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) OVERRIDE; + const ui::Event& event) override; SearchResultActionsViewDelegate* delegate_; // Not owned. int selected_action_; diff --git a/ui/app_list/views/search_result_list_view.h b/ui/app_list/views/search_result_list_view.h index e46bc23..40e9414 100644 --- a/ui/app_list/views/search_result_list_view.h +++ b/ui/app_list/views/search_result_list_view.h @@ -54,8 +54,8 @@ class APP_LIST_EXPORT SearchResultListView : public views::View, void OnSearchResultUninstalled(SearchResultView* view); // Overridden from views::View: - virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE; - virtual gfx::Size GetPreferredSize() const OVERRIDE; + virtual bool OnKeyPressed(const ui::KeyEvent& event) override; + virtual gfx::Size GetPreferredSize() const override; private: friend class test::SearchResultListViewTest; @@ -78,20 +78,20 @@ class APP_LIST_EXPORT SearchResultListView : public views::View, void ForceAutoLaunchForTest(); // Overridden from views::View: - virtual void Layout() OVERRIDE; - virtual int GetHeightForWidth(int w) const OVERRIDE; + virtual void Layout() override; + virtual int GetHeightForWidth(int w) const override; virtual void VisibilityChanged( - views::View* starting_from, bool is_visible) OVERRIDE; + views::View* starting_from, bool is_visible) override; // Overridden from gfx::AnimationDelegate: - virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE; - virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE; + virtual void AnimationEnded(const gfx::Animation* animation) override; + virtual void AnimationProgressed(const gfx::Animation* animation) override; // Overridden from ui::ListModelObserver: - virtual void ListItemsAdded(size_t start, size_t count) OVERRIDE; - virtual void ListItemsRemoved(size_t start, size_t count) OVERRIDE; - virtual void ListItemMoved(size_t index, size_t target_index) OVERRIDE; - virtual void ListItemsChanged(size_t start, size_t count) OVERRIDE; + virtual void ListItemsAdded(size_t start, size_t count) override; + virtual void ListItemsRemoved(size_t start, size_t count) override; + virtual void ListItemMoved(size_t index, size_t target_index) override; + virtual void ListItemsChanged(size_t start, size_t count) override; SearchResultListViewDelegate* delegate_; // Not owned. AppListViewDelegate* view_delegate_; // Not owned. diff --git a/ui/app_list/views/search_result_list_view_unittest.cc b/ui/app_list/views/search_result_list_view_unittest.cc index e48a760..a42ba68 100644 --- a/ui/app_list/views/search_result_list_view_unittest.cc +++ b/ui/app_list/views/search_result_list_view_unittest.cc @@ -29,7 +29,7 @@ class SearchResultListViewTest : public views::ViewsTestBase, virtual ~SearchResultListViewTest() {} // Overridden from testing::Test: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { views::ViewsTestBase::SetUp(); view_.reset(new SearchResultListView(this, &view_delegate_)); view_->SetResults(view_delegate_.GetModel()->results()); @@ -111,8 +111,8 @@ class SearchResultListViewTest : public views::ViewsTestBase, } private: - virtual void OnResultInstalled(SearchResult* result) OVERRIDE {} - virtual void OnResultUninstalled(SearchResult* result) OVERRIDE {} + virtual void OnResultInstalled(SearchResult* result) override {} + virtual void OnResultUninstalled(SearchResult* result) override {} AppListTestViewDelegate view_delegate_; scoped_ptr<SearchResultListView> view_; diff --git a/ui/app_list/views/search_result_view.h b/ui/app_list/views/search_result_view.h index c05e6bd..ae744f2 100644 --- a/ui/app_list/views/search_result_view.h +++ b/ui/app_list/views/search_result_view.h @@ -66,33 +66,33 @@ class SearchResultView : public views::CustomButton, void UpdateDetailsText(); // views::View overrides: - virtual const char* GetClassName() const OVERRIDE; - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual void Layout() OVERRIDE; - virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE; - virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + virtual const char* GetClassName() const override; + virtual gfx::Size GetPreferredSize() const override; + virtual void Layout() override; + virtual bool OnKeyPressed(const ui::KeyEvent& event) override; + virtual void ChildPreferredSizeChanged(views::View* child) override; + virtual void OnPaint(gfx::Canvas* canvas) override; // views::ButtonListener overrides: virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) OVERRIDE; + const ui::Event& event) override; // views::ContextMenuController overrides: virtual void ShowContextMenuForView(views::View* source, const gfx::Point& point, - ui::MenuSourceType source_type) OVERRIDE; + ui::MenuSourceType source_type) override; // SearchResultObserver overrides: - virtual void OnIconChanged() OVERRIDE; - virtual void OnActionsChanged() OVERRIDE; - virtual void OnIsInstallingChanged() OVERRIDE; - virtual void OnPercentDownloadedChanged() OVERRIDE; - virtual void OnItemInstalled() OVERRIDE; - virtual void OnItemUninstalled() OVERRIDE; + virtual void OnIconChanged() override; + virtual void OnActionsChanged() override; + virtual void OnIsInstallingChanged() override; + virtual void OnPercentDownloadedChanged() override; + virtual void OnItemInstalled() override; + virtual void OnItemUninstalled() override; // SearchResultActionsViewDelegate overrides: virtual void OnSearchResultActionActivated(size_t index, - int event_flags) OVERRIDE; + int event_flags) override; SearchResult* result_; // Owned by AppListModel::SearchResults. diff --git a/ui/app_list/views/speech_view.cc b/ui/app_list/views/speech_view.cc index 7fb213f..82e5f3c8 100644 --- a/ui/app_list/views/speech_view.cc +++ b/ui/app_list/views/speech_view.cc @@ -53,7 +53,7 @@ class SoundLevelIndicator : public views::View { private: // Overridden from views::View: - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + virtual void OnPaint(gfx::Canvas* canvas) override; DISALLOW_COPY_AND_ASSIGN(SoundLevelIndicator); }; @@ -79,7 +79,7 @@ class MicButton : public views::ImageButton, private: // views::MaskedTargeterDelegate: - virtual bool GetHitTestMask(gfx::Path* mask) const OVERRIDE; + virtual bool GetHitTestMask(gfx::Path* mask) const override; DISALLOW_COPY_AND_ASSIGN(MicButton); }; diff --git a/ui/app_list/views/speech_view.h b/ui/app_list/views/speech_view.h index 53a2f7b..d0d9cf6 100644 --- a/ui/app_list/views/speech_view.h +++ b/ui/app_list/views/speech_view.h @@ -34,8 +34,8 @@ class APP_LIST_EXPORT SpeechView : public views::View, void Reset(); // Overridden from views::View: - virtual void Layout() OVERRIDE; - virtual gfx::Size GetPreferredSize() const OVERRIDE; + virtual void Layout() override; + virtual gfx::Size GetPreferredSize() const override; views::ImageButton* mic_button() { return mic_button_; } @@ -44,14 +44,14 @@ class APP_LIST_EXPORT SpeechView : public views::View, // Overridden from views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) OVERRIDE; + const ui::Event& event) override; // Overridden from SpeechUIModelObserver: - virtual void OnSpeechSoundLevelChanged(uint8 level) OVERRIDE; + virtual void OnSpeechSoundLevelChanged(uint8 level) override; virtual void OnSpeechResult(const base::string16& result, - bool is_final) OVERRIDE; + bool is_final) override; virtual void OnSpeechRecognitionStateChanged( - SpeechRecognitionState new_state) OVERRIDE; + SpeechRecognitionState new_state) override; AppListViewDelegate* delegate_; diff --git a/ui/app_list/views/speech_view_unittest.cc b/ui/app_list/views/speech_view_unittest.cc index 1c49faa..ad49f0d 100644 --- a/ui/app_list/views/speech_view_unittest.cc +++ b/ui/app_list/views/speech_view_unittest.cc @@ -18,7 +18,7 @@ class SpeechViewTest : public views::test::WidgetTest, virtual ~SpeechViewTest() {} // Overridden from testing::Test: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { views::test::WidgetTest::SetUp(); widget_ = CreateTopLevelPlatformWidget(); widget_->SetBounds(gfx::Rect(0, 0, 300, 200)); @@ -27,7 +27,7 @@ class SpeechViewTest : public views::test::WidgetTest, view_->SetBoundsRect(widget_->GetContentsView()->GetLocalBounds()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { widget_->CloseNow(); views::test::WidgetTest::TearDown(); } diff --git a/ui/app_list/views/start_page_view.cc b/ui/app_list/views/start_page_view.cc index 23d2f64..580c986 100644 --- a/ui/app_list/views/start_page_view.cc +++ b/ui/app_list/views/start_page_view.cc @@ -53,7 +53,7 @@ class DummySearchBoxView : public SearchBoxView { virtual ~DummySearchBoxView() {} // Overridden from views::View: - virtual gfx::Size GetPreferredSize() const OVERRIDE { + virtual gfx::Size GetPreferredSize() const override { gfx::Size size(SearchBoxView::GetPreferredSize()); size.set_width(kDummySearchBoxWidth); return size; diff --git a/ui/app_list/views/start_page_view.h b/ui/app_list/views/start_page_view.h index 857c65a..2949ec5 100644 --- a/ui/app_list/views/start_page_view.h +++ b/ui/app_list/views/start_page_view.h @@ -41,8 +41,8 @@ class APP_LIST_EXPORT StartPageView : public views::View, SearchBoxView* dummy_search_box_view() { return search_box_view_; } // Overridden from views::View: - virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE; - virtual void Layout() OVERRIDE; + virtual bool OnKeyPressed(const ui::KeyEvent& event) override; + virtual void Layout() override; private: enum ShowState { @@ -64,13 +64,13 @@ class APP_LIST_EXPORT StartPageView : public views::View, void ScheduleUpdate(); // Overridden from SearchBoxViewDelegate: - virtual void QueryChanged(SearchBoxView* sender) OVERRIDE; + virtual void QueryChanged(SearchBoxView* sender) override; // Overridden from ui::ListModelObserver: - virtual void ListItemsAdded(size_t start, size_t count) OVERRIDE; - virtual void ListItemsRemoved(size_t start, size_t count) OVERRIDE; - virtual void ListItemMoved(size_t index, size_t target_index) OVERRIDE; - virtual void ListItemsChanged(size_t start, size_t count) OVERRIDE; + virtual void ListItemsAdded(size_t start, size_t count) override; + virtual void ListItemsRemoved(size_t start, size_t count) override; + virtual void ListItemMoved(size_t index, size_t target_index) override; + virtual void ListItemsChanged(size_t start, size_t count) override; // The parent view of ContentsView which is the parent of this view. AppListMainView* app_list_main_view_; diff --git a/ui/app_list/views/tile_item_view.h b/ui/app_list/views/tile_item_view.h index baf61aa..816adfd 100644 --- a/ui/app_list/views/tile_item_view.h +++ b/ui/app_list/views/tile_item_view.h @@ -31,15 +31,15 @@ class APP_LIST_EXPORT TileItemView : public views::CustomButton, private: // Overridden from views::View: - virtual gfx::Size GetPreferredSize() const OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; // Overridden from views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) OVERRIDE; + const ui::Event& event) override; // Overridden from SearchResultObserver: - virtual void OnIconChanged() OVERRIDE; - virtual void OnResultDestroying() OVERRIDE; + virtual void OnIconChanged() override; + virtual void OnResultDestroying() override; // Owned by the model provided by the AppListViewDelegate. SearchResult* item_; diff --git a/ui/app_list/views/top_icon_animation_view.h b/ui/app_list/views/top_icon_animation_view.h index 4dc2aa5..a3c1286 100644 --- a/ui/app_list/views/top_icon_animation_view.h +++ b/ui/app_list/views/top_icon_animation_view.h @@ -54,12 +54,12 @@ class TopIconAnimationView : public views::View, private: // views::View overrides: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual void Layout() OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual void Layout() override; // ui::ImplicitAnimationObserver overrides: - virtual void OnImplicitAnimationsCompleted() OVERRIDE; - virtual bool RequiresNotificationWhenAnimatorDestroyed() const OVERRIDE; + virtual void OnImplicitAnimationsCompleted() override; + virtual bool RequiresNotificationWhenAnimatorDestroyed() const override; gfx::Size icon_size_; views::ImageView* icon_; // Owned by views hierarchy. diff --git a/ui/aura/bench/bench_main.cc b/ui/aura/bench/bench_main.cc index 447b303..28b6d68c 100644 --- a/ui/aura/bench/bench_main.cc +++ b/ui/aura/bench/bench_main.cc @@ -60,19 +60,19 @@ class ColoredLayer : public Layer, public LayerDelegate { virtual ~ColoredLayer() {} // Overridden from LayerDelegate: - virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE { + virtual void OnPaintLayer(gfx::Canvas* canvas) override { if (draw_) { canvas->DrawColor(color_); } } virtual void OnDelegatedFrameDamage( - const gfx::Rect& damage_rect_in_dip) OVERRIDE {} + const gfx::Rect& damage_rect_in_dip) override {} - virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE { + virtual void OnDeviceScaleFactorChanged(float device_scale_factor) override { } - virtual base::Closure PrepareForLayerBoundsChange() OVERRIDE { + virtual base::Closure PrepareForLayerBoundsChange() override { return base::Closure(); } @@ -97,12 +97,12 @@ class BenchCompositorObserver : public ui::CompositorObserver { max_frames_(max_frames) { } - virtual void OnCompositingDidCommit(ui::Compositor* compositor) OVERRIDE {} + virtual void OnCompositingDidCommit(ui::Compositor* compositor) override {} virtual void OnCompositingStarted(Compositor* compositor, - base::TimeTicks start_time) OVERRIDE {} + base::TimeTicks start_time) override {} - virtual void OnCompositingEnded(Compositor* compositor) OVERRIDE { + virtual void OnCompositingEnded(Compositor* compositor) override { if (start_time_.is_null()) { start_time_ = TimeTicks::Now(); } else { @@ -121,10 +121,10 @@ class BenchCompositorObserver : public ui::CompositorObserver { } } - virtual void OnCompositingAborted(Compositor* compositor) OVERRIDE {} + virtual void OnCompositingAborted(Compositor* compositor) override {} virtual void OnCompositingLockStateChanged( - Compositor* compositor) OVERRIDE {} + Compositor* compositor) override {} virtual void Draw() {} @@ -229,7 +229,7 @@ class WebGLBench : public BenchCompositorObserver { compositor_->RemoveObserver(this); } - virtual void Draw() OVERRIDE { + virtual void Draw() override { if (do_draw_) { gpu::gles2::GLES2Interface* gl = context_provider_->ContextGL(); gl->ClearColor((frames() % kFrames)*1.0/kFrames, 1.f, 0.f, 1.f); @@ -273,7 +273,7 @@ class SoftwareScrollBench : public BenchCompositorObserver { compositor_->RemoveObserver(this); } - virtual void Draw() OVERRIDE { + virtual void Draw() override { layer_->set_color( SkColorSetARGBInline(255*(frames() % kFrames)/kFrames, 255, 0, 255)); layer_->SchedulePaint(gfx::Rect(layer_->bounds().size())); diff --git a/ui/aura/client/default_capture_client.h b/ui/aura/client/default_capture_client.h index cae13b7..41194af 100644 --- a/ui/aura/client/default_capture_client.h +++ b/ui/aura/client/default_capture_client.h @@ -20,10 +20,10 @@ class AURA_EXPORT DefaultCaptureClient : public client::CaptureClient { private: // Overridden from client::CaptureClient: - virtual void SetCapture(Window* window) OVERRIDE; - virtual void ReleaseCapture(Window* window) OVERRIDE; - virtual Window* GetCaptureWindow() OVERRIDE; - virtual Window* GetGlobalCaptureWindow() OVERRIDE; + virtual void SetCapture(Window* window) override; + virtual void ReleaseCapture(Window* window) override; + virtual Window* GetCaptureWindow() override; + virtual Window* GetGlobalCaptureWindow() override; Window* root_window_; Window* capture_window_; diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc index f531cd3..ec5ea52 100644 --- a/ui/aura/demo/demo_main.cc +++ b/ui/aura/demo/demo_main.cc @@ -39,38 +39,38 @@ class DemoWindowDelegate : public aura::WindowDelegate { explicit DemoWindowDelegate(SkColor color) : color_(color) {} // Overridden from WindowDelegate: - virtual gfx::Size GetMinimumSize() const OVERRIDE { + virtual gfx::Size GetMinimumSize() const override { return gfx::Size(); } - virtual gfx::Size GetMaximumSize() const OVERRIDE { + virtual gfx::Size GetMaximumSize() const override { return gfx::Size(); } virtual void OnBoundsChanged(const gfx::Rect& old_bounds, - const gfx::Rect& new_bounds) OVERRIDE {} - virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE { + const gfx::Rect& new_bounds) override {} + virtual gfx::NativeCursor GetCursor(const gfx::Point& point) override { return gfx::kNullCursor; } - virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE { + virtual int GetNonClientComponent(const gfx::Point& point) const override { return HTCAPTION; } virtual bool ShouldDescendIntoChildForEventHandling( aura::Window* child, - const gfx::Point& location) OVERRIDE { + const gfx::Point& location) override { return true; } - virtual bool CanFocus() OVERRIDE { return true; } - virtual void OnCaptureLost() OVERRIDE {} - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { + virtual bool CanFocus() override { return true; } + virtual void OnCaptureLost() override {} + virtual void OnPaint(gfx::Canvas* canvas) override { canvas->DrawColor(color_, SkXfermode::kSrc_Mode); } - virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE {} - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE {} - virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE {} - virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE {} - virtual bool HasHitTestMask() const OVERRIDE { return false; } - virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE {} + virtual void OnDeviceScaleFactorChanged(float device_scale_factor) override {} + virtual void OnWindowDestroying(aura::Window* window) override {} + virtual void OnWindowDestroyed(aura::Window* window) override {} + virtual void OnWindowTargetVisibilityChanged(bool visible) override {} + virtual bool HasHitTestMask() const override { return false; } + virtual void GetHitTestMask(gfx::Path* mask) const override {} private: SkColor color_; @@ -91,7 +91,7 @@ class DemoWindowTreeClient : public aura::client::WindowTreeClient { // Overridden from aura::client::WindowTreeClient: virtual aura::Window* GetDefaultParent(aura::Window* context, aura::Window* window, - const gfx::Rect& bounds) OVERRIDE { + const gfx::Rect& bounds) override { if (!capture_client_) { capture_client_.reset( new aura::client::DefaultCaptureClient(window_->GetRootWindow())); diff --git a/ui/aura/env.h b/ui/aura/env.h index e857da6..480c6cb 100644 --- a/ui/aura/env.h +++ b/ui/aura/env.h @@ -87,10 +87,10 @@ class AURA_EXPORT Env : public ui::EventTarget, public base::SupportsUserData { void NotifyHostActivated(WindowTreeHost* host); // Overridden from ui::EventTarget: - virtual bool CanAcceptEvent(const ui::Event& event) OVERRIDE; - virtual ui::EventTarget* GetParentTarget() OVERRIDE; - virtual scoped_ptr<ui::EventTargetIterator> GetChildIterator() const OVERRIDE; - virtual ui::EventTargeter* GetEventTargeter() OVERRIDE; + virtual bool CanAcceptEvent(const ui::Event& event) override; + virtual ui::EventTarget* GetParentTarget() override; + virtual scoped_ptr<ui::EventTargetIterator> GetChildIterator() const override; + virtual ui::EventTargeter* GetEventTargeter() override; ObserverList<EnvObserver> observers_; diff --git a/ui/aura/gestures/gesture_recognizer_unittest.cc b/ui/aura/gestures/gesture_recognizer_unittest.cc index 7e0faa5..5792121 100644 --- a/ui/aura/gestures/gesture_recognizer_unittest.cc +++ b/ui/aura/gestures/gesture_recognizer_unittest.cc @@ -196,7 +196,7 @@ class GestureEventConsumeDelegate : public TestWindowDelegate { run_loop_->Run(); } - virtual void OnGestureEvent(ui::GestureEvent* gesture) OVERRIDE { + virtual void OnGestureEvent(ui::GestureEvent* gesture) override { events_.push_back(gesture->type()); bounding_box_ = gesture->details().bounding_box(); flags_ = gesture->flags(); @@ -346,7 +346,7 @@ class QueueTouchEventDelegate : public GestureEventConsumeDelegate { } } - virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE { + virtual void OnTouchEvent(ui::TouchEvent* event) override { if (queue_events_) { queue_.push(new ui::TouchEvent(*event, window_, window_)); event->StopPropagation(); @@ -409,7 +409,7 @@ class GestureEventSynthDelegate : public TestWindowDelegate { bool mouse_release() const { return mouse_release_; } bool double_click() const { return double_click_; } - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE { + virtual void OnMouseEvent(ui::MouseEvent* event) override { switch (event->type()) { case ui::ET_MOUSE_PRESSED: double_click_ = event->flags() & ui::EF_IS_DOUBLE_CLICK; @@ -538,7 +538,7 @@ class TestEventHandler : public ui::EventHandler { virtual ~TestEventHandler() {} - virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE { + virtual void OnTouchEvent(ui::TouchEvent* event) override { switch (event->type()) { case ui::ET_TOUCH_RELEASED: touch_released_count_++; @@ -592,7 +592,7 @@ class RemoveOnTouchCancelHandler : public TestEventHandler { private: // ui::EventHandler: - virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE { + virtual void OnTouchEvent(ui::TouchEvent* event) override { TestEventHandler::OnTouchEvent(event); if (event->type() == ui::ET_TOUCH_CANCELLED) { Window* target = static_cast<Window*>(event->target()); @@ -633,7 +633,7 @@ class GestureRecognizerTest : public AuraTestBase, public: GestureRecognizerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { AuraTestBase::SetUp(); ui::GestureConfiguration::set_show_press_delay_in_ms(2); ui::GestureConfiguration::set_long_press_time_in_seconds(0.003); @@ -2979,7 +2979,7 @@ class ConsumesTouchMovesDelegate : public GestureEventConsumeDelegate { void set_consume_touch_move(bool consume) { consume_touch_move_ = consume; } private: - virtual void OnTouchEvent(ui::TouchEvent* touch) OVERRIDE { + virtual void OnTouchEvent(ui::TouchEvent* touch) override { if (consume_touch_move_ && touch->type() == ui::ET_TOUCH_MOVED) touch->SetHandled(); else @@ -4105,7 +4105,7 @@ class GestureEventDeleteWindowOnLongPress : public GestureEventConsumeDelegate { void set_window(aura::Window** window) { window_ = window; } - virtual void OnGestureEvent(ui::GestureEvent* gesture) OVERRIDE { + virtual void OnGestureEvent(ui::GestureEvent* gesture) override { GestureEventConsumeDelegate::OnGestureEvent(gesture); if (gesture->type() != ui::ET_GESTURE_LONG_PRESS) return; diff --git a/ui/aura/input_state_lookup_win.h b/ui/aura/input_state_lookup_win.h index 4178841..94e4ee6 100644 --- a/ui/aura/input_state_lookup_win.h +++ b/ui/aura/input_state_lookup_win.h @@ -18,7 +18,7 @@ class AURA_EXPORT InputStateLookupWin : public InputStateLookup { virtual ~InputStateLookupWin(); // InputStateLookup overrides: - virtual bool IsMouseButtonDown() const OVERRIDE; + virtual bool IsMouseButtonDown() const override; private: DISALLOW_COPY_AND_ASSIGN(InputStateLookupWin); diff --git a/ui/aura/remote_window_tree_host_win.h b/ui/aura/remote_window_tree_host_win.h index 9a726d1..d1454d2 100644 --- a/ui/aura/remote_window_tree_host_win.h +++ b/ui/aura/remote_window_tree_host_win.h @@ -116,28 +116,28 @@ class AURA_EXPORT RemoteWindowTreeHostWin void OnImeInputSourceChanged(uint16 language_id, bool is_ime); // WindowTreeHost overrides: - virtual ui::EventSource* GetEventSource() OVERRIDE; - virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE; - virtual void Show() OVERRIDE; - virtual void Hide() OVERRIDE; - virtual gfx::Rect GetBounds() const OVERRIDE; - virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; - virtual gfx::Point GetLocationOnNativeScreen() const OVERRIDE; - virtual void SetCapture() OVERRIDE; - virtual void ReleaseCapture() OVERRIDE; - virtual void PostNativeEvent(const base::NativeEvent& native_event) OVERRIDE; - virtual void SetCursorNative(gfx::NativeCursor cursor) OVERRIDE; - virtual void MoveCursorToNative(const gfx::Point& location) OVERRIDE; - virtual void OnCursorVisibilityChangedNative(bool show) OVERRIDE; + virtual ui::EventSource* GetEventSource() override; + virtual gfx::AcceleratedWidget GetAcceleratedWidget() override; + virtual void Show() override; + virtual void Hide() override; + virtual gfx::Rect GetBounds() const override; + virtual void SetBounds(const gfx::Rect& bounds) override; + virtual gfx::Point GetLocationOnNativeScreen() const override; + virtual void SetCapture() override; + virtual void ReleaseCapture() override; + virtual void PostNativeEvent(const base::NativeEvent& native_event) override; + virtual void SetCursorNative(gfx::NativeCursor cursor) override; + virtual void MoveCursorToNative(const gfx::Point& location) override; + virtual void OnCursorVisibilityChangedNative(bool show) override; // ui::EventSource: - virtual ui::EventProcessor* GetEventProcessor() OVERRIDE; + virtual ui::EventProcessor* GetEventProcessor() override; // ui::internal::RemoteInputMethodDelegateWin overrides: - virtual void CancelComposition() OVERRIDE; + virtual void CancelComposition() override; virtual void OnTextInputClientUpdated( const std::vector<int32>& input_scopes, - const std::vector<gfx::Rect>& composition_character_bounds) OVERRIDE; + const std::vector<gfx::Rect>& composition_character_bounds) override; // Helper function to dispatch a keyboard message to the desired target. // The default target is the WindowEventDispatcher. For nested message loop diff --git a/ui/aura/scoped_window_targeter.h b/ui/aura/scoped_window_targeter.h index f8546c5..14c3e89 100644 --- a/ui/aura/scoped_window_targeter.h +++ b/ui/aura/scoped_window_targeter.h @@ -33,7 +33,7 @@ class AURA_EXPORT ScopedWindowTargeter : public WindowObserver { private: // WindowObserver: - virtual void OnWindowDestroyed(Window* window) OVERRIDE; + virtual void OnWindowDestroyed(Window* window) override; Window* window_; scoped_ptr<ui::EventTargeter> old_targeter_; diff --git a/ui/aura/test/aura_test_base.h b/ui/aura/test/aura_test_base.h index b9f6e7f..4717243 100644 --- a/ui/aura/test/aura_test_base.h +++ b/ui/aura/test/aura_test_base.h @@ -24,8 +24,8 @@ class AuraTestBase : public testing::Test { virtual ~AuraTestBase(); // testing::Test: - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; // Creates a normal window parented to |parent|. aura::Window* CreateNormalWindow(int id, Window* parent, diff --git a/ui/aura/test/event_generator_delegate_aura.cc b/ui/aura/test/event_generator_delegate_aura.cc index a4041a3..576cc8e 100644 --- a/ui/aura/test/event_generator_delegate_aura.cc +++ b/ui/aura/test/event_generator_delegate_aura.cc @@ -22,17 +22,17 @@ class DefaultEventGeneratorDelegate : public EventGeneratorDelegateAura { // EventGeneratorDelegate: virtual void SetContext(ui::test::EventGenerator* owner, gfx::NativeWindow root_window, - gfx::NativeWindow window) OVERRIDE { + gfx::NativeWindow window) override { root_window_ = root_window; } // EventGeneratorDelegateAura: - virtual WindowTreeHost* GetHostAt(const gfx::Point& point) const OVERRIDE { + virtual WindowTreeHost* GetHostAt(const gfx::Point& point) const override { return root_window_->GetHost(); } virtual client::ScreenPositionClient* GetScreenPositionClient( - const aura::Window* window) const OVERRIDE { + const aura::Window* window) const override { return NULL; } diff --git a/ui/aura/test/event_generator_delegate_aura.h b/ui/aura/test/event_generator_delegate_aura.h index 5d37538..b43bf68 100644 --- a/ui/aura/test/event_generator_delegate_aura.h +++ b/ui/aura/test/event_generator_delegate_aura.h @@ -35,17 +35,17 @@ class EventGeneratorDelegateAura : public ui::test::EventGeneratorDelegate { const aura::Window* window) const = 0; // Overridden from ui::test::EventGeneratorDelegate: - virtual ui::EventTarget* GetTargetAt(const gfx::Point& location) OVERRIDE; - virtual ui::EventSource* GetEventSource(ui::EventTarget* target) OVERRIDE; + virtual ui::EventTarget* GetTargetAt(const gfx::Point& location) override; + virtual ui::EventSource* GetEventSource(ui::EventTarget* target) override; virtual gfx::Point CenterOfTarget( - const ui::EventTarget* target) const OVERRIDE; - virtual gfx::Point CenterOfWindow(gfx::NativeWindow window) const OVERRIDE; + const ui::EventTarget* target) const override; + virtual gfx::Point CenterOfWindow(gfx::NativeWindow window) const override; virtual void ConvertPointFromTarget(const ui::EventTarget* target, - gfx::Point* point) const OVERRIDE; + gfx::Point* point) const override; virtual void ConvertPointToTarget(const ui::EventTarget* target, - gfx::Point* point) const OVERRIDE; + gfx::Point* point) const override; virtual void ConvertPointFromHost(const ui::EventTarget* hosted_target, - gfx::Point* point) const OVERRIDE; + gfx::Point* point) const override; private: DISALLOW_COPY_AND_ASSIGN(EventGeneratorDelegateAura); diff --git a/ui/aura/test/test_cursor_client.h b/ui/aura/test/test_cursor_client.h index 1372c33..c3f845e 100644 --- a/ui/aura/test/test_cursor_client.h +++ b/ui/aura/test/test_cursor_client.h @@ -32,26 +32,26 @@ class TestCursorClient : public aura::client::CursorClient { } // Overridden from aura::client::CursorClient: - virtual void SetCursor(gfx::NativeCursor cursor) OVERRIDE; - virtual gfx::NativeCursor GetCursor() const OVERRIDE; - virtual void ShowCursor() OVERRIDE; - virtual void HideCursor() OVERRIDE; - virtual void SetCursorSet(ui::CursorSetType cursor_set) OVERRIDE; - virtual ui::CursorSetType GetCursorSet() const OVERRIDE; - virtual bool IsCursorVisible() const OVERRIDE; - virtual void EnableMouseEvents() OVERRIDE; - virtual void DisableMouseEvents() OVERRIDE; - virtual bool IsMouseEventsEnabled() const OVERRIDE; - virtual void SetDisplay(const gfx::Display& display) OVERRIDE; - virtual void LockCursor() OVERRIDE; - virtual void UnlockCursor() OVERRIDE; - virtual bool IsCursorLocked() const OVERRIDE; + virtual void SetCursor(gfx::NativeCursor cursor) override; + virtual gfx::NativeCursor GetCursor() const override; + virtual void ShowCursor() override; + virtual void HideCursor() override; + virtual void SetCursorSet(ui::CursorSetType cursor_set) override; + virtual ui::CursorSetType GetCursorSet() const override; + virtual bool IsCursorVisible() const override; + virtual void EnableMouseEvents() override; + virtual void DisableMouseEvents() override; + virtual bool IsMouseEventsEnabled() const override; + virtual void SetDisplay(const gfx::Display& display) override; + virtual void LockCursor() override; + virtual void UnlockCursor() override; + virtual bool IsCursorLocked() const override; virtual void AddObserver( - aura::client::CursorClientObserver* observer) OVERRIDE; + aura::client::CursorClientObserver* observer) override; virtual void RemoveObserver( - aura::client::CursorClientObserver* observer) OVERRIDE; + aura::client::CursorClientObserver* observer) override; virtual bool ShouldHideCursorOnKeyEvent( - const ui::KeyEvent& event) const OVERRIDE; + const ui::KeyEvent& event) const override; private: bool visible_; diff --git a/ui/aura/test/test_focus_client.h b/ui/aura/test/test_focus_client.h index 06ae3c8..5f9f718 100644 --- a/ui/aura/test/test_focus_client.h +++ b/ui/aura/test/test_focus_client.h @@ -22,14 +22,14 @@ class TestFocusClient : public client::FocusClient, private: // Overridden from client::FocusClient: - virtual void AddObserver(client::FocusChangeObserver* observer) OVERRIDE; - virtual void RemoveObserver(client::FocusChangeObserver* observer) OVERRIDE; - virtual void FocusWindow(Window* window) OVERRIDE; - virtual void ResetFocusWithinActiveWindow(Window* window) OVERRIDE; - virtual Window* GetFocusedWindow() OVERRIDE; + virtual void AddObserver(client::FocusChangeObserver* observer) override; + virtual void RemoveObserver(client::FocusChangeObserver* observer) override; + virtual void FocusWindow(Window* window) override; + virtual void ResetFocusWithinActiveWindow(Window* window) override; + virtual Window* GetFocusedWindow() override; // Overridden from WindowObserver: - virtual void OnWindowDestroying(Window* window) OVERRIDE; + virtual void OnWindowDestroying(Window* window) override; Window* focused_window_; ScopedObserver<Window, WindowObserver> observer_manager_; diff --git a/ui/aura/test/test_screen.h b/ui/aura/test/test_screen.h index 7310008..7b1f98b 100644 --- a/ui/aura/test/test_screen.h +++ b/ui/aura/test/test_screen.h @@ -45,26 +45,26 @@ class TestScreen : public gfx::Screen, // WindowObserver overrides: virtual void OnWindowBoundsChanged(Window* window, const gfx::Rect& old_bounds, - const gfx::Rect& new_bounds) OVERRIDE; - virtual void OnWindowDestroying(Window* window) OVERRIDE; + const gfx::Rect& new_bounds) override; + virtual void OnWindowDestroying(Window* window) override; // gfx::Screen overrides: - virtual bool IsDIPEnabled() OVERRIDE; - virtual gfx::Point GetCursorScreenPoint() OVERRIDE; - virtual gfx::NativeWindow GetWindowUnderCursor() OVERRIDE; + virtual bool IsDIPEnabled() override; + virtual gfx::Point GetCursorScreenPoint() override; + virtual gfx::NativeWindow GetWindowUnderCursor() override; virtual gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) - OVERRIDE; - virtual int GetNumDisplays() const OVERRIDE; - virtual std::vector<gfx::Display> GetAllDisplays() const OVERRIDE; + override; + virtual int GetNumDisplays() const override; + virtual std::vector<gfx::Display> GetAllDisplays() const override; virtual gfx::Display GetDisplayNearestWindow( - gfx::NativeView view) const OVERRIDE; + gfx::NativeView view) const override; virtual gfx::Display GetDisplayNearestPoint( - const gfx::Point& point) const OVERRIDE; + const gfx::Point& point) const override; virtual gfx::Display GetDisplayMatching( - const gfx::Rect& match_rect) const OVERRIDE; - virtual gfx::Display GetPrimaryDisplay() const OVERRIDE; - virtual void AddObserver(gfx::DisplayObserver* observer) OVERRIDE; - virtual void RemoveObserver(gfx::DisplayObserver* observer) OVERRIDE; + const gfx::Rect& match_rect) const override; + virtual gfx::Display GetPrimaryDisplay() const override; + virtual void AddObserver(gfx::DisplayObserver* observer) override; + virtual void RemoveObserver(gfx::DisplayObserver* observer) override; private: explicit TestScreen(const gfx::Rect& screen_bounds); diff --git a/ui/aura/test/test_window_delegate.h b/ui/aura/test/test_window_delegate.h index 6f36e44..1cb142a 100644 --- a/ui/aura/test/test_window_delegate.h +++ b/ui/aura/test/test_window_delegate.h @@ -42,24 +42,24 @@ class TestWindowDelegate : public WindowDelegate { void set_can_focus(bool can_focus) { can_focus_ = can_focus; } // Overridden from WindowDelegate: - virtual gfx::Size GetMinimumSize() const OVERRIDE; - virtual gfx::Size GetMaximumSize() const OVERRIDE; + virtual gfx::Size GetMinimumSize() const override; + virtual gfx::Size GetMaximumSize() const override; virtual void OnBoundsChanged(const gfx::Rect& old_bounds, - const gfx::Rect& new_bounds) OVERRIDE; - virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE; - virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE; + const gfx::Rect& new_bounds) override; + virtual gfx::NativeCursor GetCursor(const gfx::Point& point) override; + virtual int GetNonClientComponent(const gfx::Point& point) const override; virtual bool ShouldDescendIntoChildForEventHandling( Window* child, - const gfx::Point& location) OVERRIDE; - virtual bool CanFocus() OVERRIDE; - virtual void OnCaptureLost() OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; - virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE; - virtual void OnWindowDestroying(Window* window) OVERRIDE; - virtual void OnWindowDestroyed(Window* window) OVERRIDE; - virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE; - virtual bool HasHitTestMask() const OVERRIDE; - virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE; + const gfx::Point& location) override; + virtual bool CanFocus() override; + virtual void OnCaptureLost() override; + virtual void OnPaint(gfx::Canvas* canvas) override; + virtual void OnDeviceScaleFactorChanged(float device_scale_factor) override; + virtual void OnWindowDestroying(Window* window) override; + virtual void OnWindowDestroyed(Window* window) override; + virtual void OnWindowTargetVisibilityChanged(bool visible) override; + virtual bool HasHitTestMask() const override; + virtual void GetHitTestMask(gfx::Path* mask) const override; private: int window_component_; @@ -81,9 +81,9 @@ class ColorTestWindowDelegate : public TestWindowDelegate { ui::KeyboardCode last_key_code() const { return last_key_code_; } // Overridden from TestWindowDelegate: - virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE; - virtual void OnWindowDestroyed(Window* window) OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + virtual void OnKeyEvent(ui::KeyEvent* event) override; + virtual void OnWindowDestroyed(Window* window) override; + virtual void OnPaint(gfx::Canvas* canvas) override; private: SkColor color_; @@ -98,8 +98,8 @@ class MaskedWindowDelegate : public TestWindowDelegate { explicit MaskedWindowDelegate(const gfx::Rect mask_rect); // Overridden from TestWindowDelegate: - virtual bool HasHitTestMask() const OVERRIDE; - virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE; + virtual bool HasHitTestMask() const override; + virtual void GetHitTestMask(gfx::Path* mask) const override; private: gfx::Rect mask_rect_; @@ -113,9 +113,9 @@ class EventCountDelegate : public TestWindowDelegate { EventCountDelegate(); // Overridden from TestWindowDelegate: - virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE; - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; + virtual void OnKeyEvent(ui::KeyEvent* event) override; + virtual void OnMouseEvent(ui::MouseEvent* event) override; + virtual void OnGestureEvent(ui::GestureEvent* event) override; // Returns the counts of mouse motion events in the // form of "<enter> <move> <leave>". diff --git a/ui/aura/test/test_window_tree_client.h b/ui/aura/test/test_window_tree_client.h index 7b3c5ee..8856a9f 100644 --- a/ui/aura/test/test_window_tree_client.h +++ b/ui/aura/test/test_window_tree_client.h @@ -21,7 +21,7 @@ class TestWindowTreeClient : public client::WindowTreeClient { // Overridden from client::WindowTreeClient: virtual Window* GetDefaultParent(Window* context, Window* window, - const gfx::Rect& bounds) OVERRIDE; + const gfx::Rect& bounds) override; private: Window* root_window_; diff --git a/ui/aura/test/ui_controls_factory_aurax11.cc b/ui/aura/test/ui_controls_factory_aurax11.cc index 59db324..8f6b278 100644 --- a/ui/aura/test/ui_controls_factory_aurax11.cc +++ b/ui/aura/test/ui_controls_factory_aurax11.cc @@ -55,7 +55,7 @@ class UIControlsX11 : public UIControlsAura { bool control, bool shift, bool alt, - bool command) OVERRIDE { + bool command) override { return SendKeyPressNotifyWhenDone( window, key, control, shift, alt, command, base::Closure()); } @@ -66,7 +66,7 @@ class UIControlsX11 : public UIControlsAura { bool shift, bool alt, bool command, - const base::Closure& closure) OVERRIDE { + const base::Closure& closure) override { XEvent xevent = {0}; xevent.xkey.type = KeyPress; if (control) @@ -98,13 +98,13 @@ class UIControlsX11 : public UIControlsAura { return true; } - virtual bool SendMouseMove(long screen_x, long screen_y) OVERRIDE { + virtual bool SendMouseMove(long screen_x, long screen_y) override { return SendMouseMoveNotifyWhenDone(screen_x, screen_y, base::Closure()); } virtual bool SendMouseMoveNotifyWhenDone( long screen_x, long screen_y, - const base::Closure& closure) OVERRIDE { + const base::Closure& closure) override { gfx::Point root_location(screen_x, screen_y); aura::client::ScreenPositionClient* screen_position_client = aura::client::GetScreenPositionClient(host_->window()); @@ -134,13 +134,13 @@ class UIControlsX11 : public UIControlsAura { RunClosureAfterAllPendingUIEvents(closure); return true; } - virtual bool SendMouseEvents(MouseButton type, int state) OVERRIDE { + virtual bool SendMouseEvents(MouseButton type, int state) override { return SendMouseEventsNotifyWhenDone(type, state, base::Closure()); } virtual bool SendMouseEventsNotifyWhenDone( MouseButton type, int state, - const base::Closure& closure) OVERRIDE { + const base::Closure& closure) override { XEvent xevent = {0}; XButtonEvent* xbutton = &xevent.xbutton; gfx::Point mouse_loc = aura::Env::GetInstance()->last_mouse_location(); @@ -181,11 +181,11 @@ class UIControlsX11 : public UIControlsAura { RunClosureAfterAllPendingUIEvents(closure); return true; } - virtual bool SendMouseClick(MouseButton type) OVERRIDE { + virtual bool SendMouseClick(MouseButton type) override { return SendMouseEvents(type, UP | DOWN); } virtual void RunClosureAfterAllPendingUIEvents( - const base::Closure& closure) OVERRIDE { + const base::Closure& closure) override { if (closure.is_null()) return; static XEvent* marker_event = NULL; diff --git a/ui/aura/test/ui_controls_factory_ozone.cc b/ui/aura/test/ui_controls_factory_ozone.cc index 4c5330c..5bd96bb 100644 --- a/ui/aura/test/ui_controls_factory_ozone.cc +++ b/ui/aura/test/ui_controls_factory_ozone.cc @@ -24,7 +24,7 @@ class UIControlsOzone : public ui_controls::UIControlsAura { bool control, bool shift, bool alt, - bool command) OVERRIDE { + bool command) override { return SendKeyPressNotifyWhenDone( window, key, control, shift, alt, command, base::Closure()); } @@ -35,7 +35,7 @@ class UIControlsOzone : public ui_controls::UIControlsAura { bool shift, bool alt, bool command, - const base::Closure& closure) OVERRIDE { + const base::Closure& closure) override { int flags = button_down_mask_; if (control) { @@ -85,13 +85,13 @@ class UIControlsOzone : public ui_controls::UIControlsAura { return true; } - virtual bool SendMouseMove(long screen_x, long screen_y) OVERRIDE { + virtual bool SendMouseMove(long screen_x, long screen_y) override { return SendMouseMoveNotifyWhenDone(screen_x, screen_y, base::Closure()); } virtual bool SendMouseMoveNotifyWhenDone( long screen_x, long screen_y, - const base::Closure& closure) OVERRIDE { + const base::Closure& closure) override { gfx::Point root_location(screen_x, screen_y); aura::client::ScreenPositionClient* screen_position_client = aura::client::GetScreenPositionClient(host_->window()); @@ -112,13 +112,13 @@ class UIControlsOzone : public ui_controls::UIControlsAura { return true; } virtual bool SendMouseEvents(ui_controls::MouseButton type, - int state) OVERRIDE { + int state) override { return SendMouseEventsNotifyWhenDone(type, state, base::Closure()); } virtual bool SendMouseEventsNotifyWhenDone( ui_controls::MouseButton type, int state, - const base::Closure& closure) OVERRIDE { + const base::Closure& closure) override { gfx::Point loc = aura::Env::GetInstance()->last_mouse_location(); aura::client::ScreenPositionClient* screen_position_client = aura::client::GetScreenPositionClient(host_->window()); @@ -155,11 +155,11 @@ class UIControlsOzone : public ui_controls::UIControlsAura { RunClosureAfterAllPendingUIEvents(closure); return true; } - virtual bool SendMouseClick(ui_controls::MouseButton type) OVERRIDE { + virtual bool SendMouseClick(ui_controls::MouseButton type) override { return SendMouseEvents(type, ui_controls::UP | ui_controls::DOWN); } virtual void RunClosureAfterAllPendingUIEvents( - const base::Closure& closure) OVERRIDE { + const base::Closure& closure) override { if (!closure.is_null()) base::MessageLoop::current()->PostTask(FROM_HERE, closure); } diff --git a/ui/aura/window.h b/ui/aura/window.h index dd08697..1a2721a 100644 --- a/ui/aura/window.h +++ b/ui/aura/window.h @@ -312,7 +312,7 @@ class AURA_EXPORT Window : public ui::LayerDelegate, typedef void (*PropertyDeallocator)(int64 value); // Overridden from ui::LayerDelegate: - virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE; + virtual void OnDeviceScaleFactorChanged(float device_scale_factor) override; #if !defined(NDEBUG) // These methods are useful when debugging. @@ -455,18 +455,18 @@ class AURA_EXPORT Window : public ui::LayerDelegate, void OnWindowBoundsChanged(const gfx::Rect& old_bounds); // Overridden from ui::LayerDelegate: - virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE; + virtual void OnPaintLayer(gfx::Canvas* canvas) override; virtual void OnDelegatedFrameDamage( - const gfx::Rect& damage_rect_in_dip) OVERRIDE; - virtual base::Closure PrepareForLayerBoundsChange() OVERRIDE; + const gfx::Rect& damage_rect_in_dip) override; + virtual base::Closure PrepareForLayerBoundsChange() override; // Overridden from ui::EventTarget: - virtual bool CanAcceptEvent(const ui::Event& event) OVERRIDE; - virtual EventTarget* GetParentTarget() OVERRIDE; - virtual scoped_ptr<ui::EventTargetIterator> GetChildIterator() const OVERRIDE; - virtual ui::EventTargeter* GetEventTargeter() OVERRIDE; + virtual bool CanAcceptEvent(const ui::Event& event) override; + virtual EventTarget* GetParentTarget() override; + virtual scoped_ptr<ui::EventTargetIterator> GetChildIterator() const override; + virtual ui::EventTargeter* GetEventTargeter() override; virtual void ConvertEventToTarget(ui::EventTarget* target, - ui::LocatedEvent* event) OVERRIDE; + ui::LocatedEvent* event) override; // Updates the layer name based on the window's name and id. void UpdateLayerName(); diff --git a/ui/aura/window_event_dispatcher.h b/ui/aura/window_event_dispatcher.h index 1620af3..a93c5d8 100644 --- a/ui/aura/window_event_dispatcher.h +++ b/ui/aura/window_event_dispatcher.h @@ -168,44 +168,44 @@ class AURA_EXPORT WindowEventDispatcher : public ui::EventProcessor, Window* GetGestureTarget(ui::GestureEvent* event); // Overridden from aura::client::CaptureDelegate: - virtual void UpdateCapture(Window* old_capture, Window* new_capture) OVERRIDE; - virtual void OnOtherRootGotCapture() OVERRIDE; - virtual void SetNativeCapture() OVERRIDE; - virtual void ReleaseNativeCapture() OVERRIDE; + virtual void UpdateCapture(Window* old_capture, Window* new_capture) override; + virtual void OnOtherRootGotCapture() override; + virtual void SetNativeCapture() override; + virtual void ReleaseNativeCapture() override; // Overridden from ui::EventProcessor: - virtual ui::EventTarget* GetRootTarget() OVERRIDE; - virtual void OnEventProcessingStarted(ui::Event* event) OVERRIDE; + virtual ui::EventTarget* GetRootTarget() override; + virtual void OnEventProcessingStarted(ui::Event* event) override; // Overridden from ui::EventDispatcherDelegate. - virtual bool CanDispatchToTarget(ui::EventTarget* target) OVERRIDE; + virtual bool CanDispatchToTarget(ui::EventTarget* target) override; virtual ui::EventDispatchDetails PreDispatchEvent(ui::EventTarget* target, - ui::Event* event) OVERRIDE; + ui::Event* event) override; virtual ui::EventDispatchDetails PostDispatchEvent( - ui::EventTarget* target, const ui::Event& event) OVERRIDE; + ui::EventTarget* target, const ui::Event& event) override; // Overridden from ui::GestureEventHelper. - virtual bool CanDispatchToConsumer(ui::GestureConsumer* consumer) OVERRIDE; - virtual void DispatchGestureEvent(ui::GestureEvent* event) OVERRIDE; - virtual void DispatchCancelTouchEvent(ui::TouchEvent* event) OVERRIDE; + virtual bool CanDispatchToConsumer(ui::GestureConsumer* consumer) override; + virtual void DispatchGestureEvent(ui::GestureEvent* event) override; + virtual void DispatchCancelTouchEvent(ui::TouchEvent* event) override; // Overridden from WindowObserver: - virtual void OnWindowDestroying(Window* window) OVERRIDE; - virtual void OnWindowDestroyed(Window* window) OVERRIDE; - virtual void OnWindowAddedToRootWindow(Window* window) OVERRIDE; + virtual void OnWindowDestroying(Window* window) override; + virtual void OnWindowDestroyed(Window* window) override; + virtual void OnWindowAddedToRootWindow(Window* window) override; virtual void OnWindowRemovingFromRootWindow(Window* window, - Window* new_root) OVERRIDE; + Window* new_root) override; virtual void OnWindowVisibilityChanging(Window* window, - bool visible) OVERRIDE; - virtual void OnWindowVisibilityChanged(Window* window, bool visible) OVERRIDE; + bool visible) override; + virtual void OnWindowVisibilityChanged(Window* window, bool visible) override; virtual void OnWindowBoundsChanged(Window* window, const gfx::Rect& old_bounds, - const gfx::Rect& new_bounds) OVERRIDE; - virtual void OnWindowTransforming(Window* window) OVERRIDE; - virtual void OnWindowTransformed(Window* window) OVERRIDE; + const gfx::Rect& new_bounds) override; + virtual void OnWindowTransforming(Window* window) override; + virtual void OnWindowTransformed(Window* window) override; // Overridden from EnvObserver: - virtual void OnWindowInitialized(Window* window) OVERRIDE; + virtual void OnWindowInitialized(Window* window) override; // We hold and aggregate mouse drags and touch moves as a way of throttling // resizes when HoldMouseMoves() is called. The following methods are used to diff --git a/ui/aura/window_event_dispatcher_unittest.cc b/ui/aura/window_event_dispatcher_unittest.cc index 94c9aba..4ef4cae 100644 --- a/ui/aura/window_event_dispatcher_unittest.cc +++ b/ui/aura/window_event_dispatcher_unittest.cc @@ -53,13 +53,13 @@ class NonClientDelegate : public test::TestWindowDelegate { gfx::Point mouse_event_location() const { return mouse_event_location_; } int mouse_event_flags() const { return mouse_event_flags_; } - virtual int GetNonClientComponent(const gfx::Point& location) const OVERRIDE { + virtual int GetNonClientComponent(const gfx::Point& location) const override { NonClientDelegate* self = const_cast<NonClientDelegate*>(this); self->non_client_count_++; self->non_client_location_ = location; return HTTOPLEFT; } - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE { + virtual void OnMouseEvent(ui::MouseEvent* event) override { mouse_event_count_++; mouse_event_location_ = event->location(); mouse_event_flags_ = event->flags(); @@ -83,7 +83,7 @@ class ConsumeKeyHandler : public ui::test::TestEventHandler { virtual ~ConsumeKeyHandler() {} // Overridden from ui::EventHandler: - virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE { + virtual void OnKeyEvent(ui::KeyEvent* event) override { ui::test::TestEventHandler::OnKeyEvent(event); event->StopPropagation(); } @@ -268,13 +268,13 @@ class TestEventClient : public client::EventClient { private: // Overridden from client::EventClient: virtual bool CanProcessEventsWithinSubtree( - const Window* window) const OVERRIDE { + const Window* window) const override { return lock_ ? window->Contains(GetLockWindow()) || GetLockWindow()->Contains(window) : true; } - virtual ui::EventTarget* GetToplevelEventTarget() OVERRIDE { + virtual ui::EventTarget* GetToplevelEventTarget() override { return NULL; } @@ -486,7 +486,7 @@ class EventFilterRecorder : public ui::EventHandler { } // ui::EventHandler overrides: - virtual void OnEvent(ui::Event* event) OVERRIDE { + virtual void OnEvent(ui::Event* event) override { ui::EventHandler::OnEvent(event); events_.push_back(event->type()); if (wait_until_event_ == event->type() && run_loop_) { @@ -495,16 +495,16 @@ class EventFilterRecorder : public ui::EventHandler { } } - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE { + virtual void OnMouseEvent(ui::MouseEvent* event) override { mouse_locations_.push_back(event->location()); mouse_event_flags_.push_back(event->flags()); } - virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE { + virtual void OnTouchEvent(ui::TouchEvent* event) override { touch_locations_.push_back(event->location()); } - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE { + virtual void OnGestureEvent(ui::GestureEvent* event) override { gesture_locations_.push_back(event->location()); } @@ -838,7 +838,7 @@ class HoldPointerOnScrollHandler : public ui::test::TestEventHandler { private: // ui::test::TestEventHandler: - virtual void OnGestureEvent(ui::GestureEvent* gesture) OVERRIDE { + virtual void OnGestureEvent(ui::GestureEvent* gesture) override { if (!holding_moves_ && gesture->type() == ui::ET_GESTURE_SCROLL_UPDATE) { holding_moves_ = true; dispatcher_->HoldPointerMoves(); @@ -1141,12 +1141,12 @@ class DeletingEventFilter : public ui::EventHandler { private: // Overridden from ui::EventHandler: - virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE { + virtual void OnKeyEvent(ui::KeyEvent* event) override { if (delete_during_pre_handle_) delete event->target(); } - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE { + virtual void OnMouseEvent(ui::MouseEvent* event) override { if (delete_during_pre_handle_) delete event->target(); } @@ -1173,13 +1173,13 @@ class DeletingWindowDelegate : public test::TestWindowDelegate { private: // Overridden from WindowDelegate: - virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE { + virtual void OnKeyEvent(ui::KeyEvent* event) override { if (delete_during_handle_) delete window_; got_event_ = true; } - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE { + virtual void OnMouseEvent(ui::MouseEvent* event) override { if (delete_during_handle_) delete window_; got_event_ = true; @@ -1242,7 +1242,7 @@ class DetachesParentOnTapDelegate : public test::TestWindowDelegate { virtual ~DetachesParentOnTapDelegate() {} private: - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE { + virtual void OnGestureEvent(ui::GestureEvent* event) override { if (event->type() == ui::ET_GESTURE_TAP_DOWN) { event->SetHandled(); return; @@ -1287,7 +1287,7 @@ class NestedGestureDelegate : public test::TestWindowDelegate { int gesture_end_count() const { return gesture_end_count_; } private: - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE { + virtual void OnGestureEvent(ui::GestureEvent* event) override { switch (event->type()) { case ui::ET_GESTURE_TAP_DOWN: event->SetHandled(); @@ -1373,7 +1373,7 @@ class RepostGestureEventRecorder : public EventFilterRecorder { virtual ~RepostGestureEventRecorder() {} - virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE { + virtual void OnTouchEvent(ui::TouchEvent* event) override { if (reposted_ && event->type() == ui::ET_TOUCH_PRESSED) { done_cleanup_ = true; Reset(); @@ -1381,7 +1381,7 @@ class RepostGestureEventRecorder : public EventFilterRecorder { EventFilterRecorder::OnTouchEvent(event); } - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE { + virtual void OnGestureEvent(ui::GestureEvent* event) override { EXPECT_EQ(done_cleanup_ ? repost_target_ : repost_source_, event->target()); if (event->type() == ui::ET_GESTURE_TAP_DOWN) { if (!reposted_) { @@ -1399,7 +1399,7 @@ class RepostGestureEventRecorder : public EventFilterRecorder { // Ignore mouse events as they don't fire at all times. This causes // the GestureRepostEventOrder test to fail randomly. - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE {} + virtual void OnMouseEvent(ui::MouseEvent* event) override {} private: aura::Window* repost_source_; @@ -1481,7 +1481,7 @@ class OnMouseExitDeletingEventFilter : public EventFilterRecorder { private: // Overridden from ui::EventHandler: - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE { + virtual void OnMouseEvent(ui::MouseEvent* event) override { EventFilterRecorder::OnMouseEvent(event); if (window_to_delete_) { delete window_to_delete_; @@ -1547,7 +1547,7 @@ class ValidRootDuringDestructionWindowObserver : public aura::WindowObserver { } // WindowObserver: - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE { + virtual void OnWindowDestroying(aura::Window* window) override { *got_destroying_ = true; *has_valid_root_ = (window->GetRootWindow() != NULL); } @@ -1592,7 +1592,7 @@ class DontResetHeldEventWindowDelegate : public test::TestWindowDelegate { int mouse_event_count() const { return mouse_event_count_; } // TestWindowDelegate: - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE { + virtual void OnMouseEvent(ui::MouseEvent* event) override { if ((event->flags() & ui::EF_SHIFT_DOWN) != 0 && mouse_event_count_++ == 0) { ui::MouseEvent mouse_event(ui::ET_MOUSE_PRESSED, @@ -1653,13 +1653,13 @@ class DeleteHostFromHeldMouseEventDelegate bool got_destroy() const { return got_destroy_; } // TestWindowDelegate: - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE { + virtual void OnMouseEvent(ui::MouseEvent* event) override { if ((event->flags() & ui::EF_SHIFT_DOWN) != 0) { got_mouse_event_ = true; delete host_; } } - virtual void OnWindowDestroyed(Window* window) OVERRIDE { + virtual void OnWindowDestroyed(Window* window) override { got_destroy_ = true; } @@ -1824,11 +1824,11 @@ class CaptureWindowTracker : public test::TestWindowDelegate { capture_window_.reset(); } - virtual void OnCaptureLost() OVERRIDE { + virtual void OnCaptureLost() override { capture_window_.reset(); } - virtual void OnWindowDestroyed(Window* window) OVERRIDE { + virtual void OnWindowDestroyed(Window* window) override { TestWindowDelegate::OnWindowDestroyed(window); capture_window_.reset(); } @@ -1865,7 +1865,7 @@ class ExitMessageLoopOnMousePress : public ui::test::TestEventHandler { virtual ~ExitMessageLoopOnMousePress() {} protected: - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE { + virtual void OnMouseEvent(ui::MouseEvent* event) override { ui::test::TestEventHandler::OnMouseEvent(event); if (event->type() == ui::ET_MOUSE_PRESSED) base::MessageLoopForUI::current()->Quit(); @@ -1915,13 +1915,13 @@ class WindowEventDispatcherTestWithMessageLoop } protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { WindowEventDispatcherTest::SetUp(); window_.reset(CreateNormalWindow(1, root_window(), NULL)); window_->AddPreTargetHandler(&handler_); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { window_.reset(); WindowEventDispatcherTest::TearDown(); } @@ -1956,7 +1956,7 @@ class WindowEventDispatcherTestInHighDPI : public WindowEventDispatcherTest { virtual ~WindowEventDispatcherTestInHighDPI() {} protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { WindowEventDispatcherTest::SetUp(); test_screen()->SetDeviceScaleFactor(2.f); } @@ -2034,7 +2034,7 @@ class SelfDestructDelegate : public test::TestWindowDelegate { SelfDestructDelegate() {} virtual ~SelfDestructDelegate() {} - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE { + virtual void OnMouseEvent(ui::MouseEvent* event) override { window_.reset(); } @@ -2087,11 +2087,11 @@ class StaticFocusClient : public client::FocusClient { private: // client::FocusClient: - virtual void AddObserver(client::FocusChangeObserver* observer) OVERRIDE {} - virtual void RemoveObserver(client::FocusChangeObserver* observer) OVERRIDE {} - virtual void FocusWindow(Window* window) OVERRIDE {} - virtual void ResetFocusWithinActiveWindow(Window* window) OVERRIDE {} - virtual Window* GetFocusedWindow() OVERRIDE { return focused_; } + virtual void AddObserver(client::FocusChangeObserver* observer) override {} + virtual void RemoveObserver(client::FocusChangeObserver* observer) override {} + virtual void FocusWindow(Window* window) override {} + virtual void ResetFocusWithinActiveWindow(Window* window) override {} + virtual Window* GetFocusedWindow() override { return focused_; } Window* focused_; @@ -2126,7 +2126,7 @@ class DispatchEventHandler : public ui::EventHandler { bool dispatched() const { return dispatched_; } private: // ui::EventHandler: - virtual void OnMouseEvent(ui::MouseEvent* mouse) OVERRIDE { + virtual void OnMouseEvent(ui::MouseEvent* mouse) override { if (mouse->type() == ui::ET_MOUSE_MOVED) { ui::MouseEvent move(ui::ET_MOUSE_MOVED, target_->bounds().CenterPoint(), target_->bounds().CenterPoint(), ui::EF_NONE, ui::EF_NONE); @@ -2156,7 +2156,7 @@ class MoveWindowHandler : public ui::EventHandler { private: // ui::EventHandler: - virtual void OnMouseEvent(ui::MouseEvent* mouse) OVERRIDE { + virtual void OnMouseEvent(ui::MouseEvent* mouse) override { if (mouse->type() == ui::ET_MOUSE_MOVED) { root_window_to_move_to_->AddChild(window_to_move_); } @@ -2222,7 +2222,7 @@ class AlwaysMouseDownInputStateLookup : public InputStateLookup { private: // InputStateLookup: - virtual bool IsMouseButtonDown() const OVERRIDE { return true; } + virtual bool IsMouseButtonDown() const override { return true; } DISALLOW_COPY_AND_ASSIGN(AlwaysMouseDownInputStateLookup); }; @@ -2319,7 +2319,7 @@ class AsyncWindowDelegate : public test::TestWindowDelegate { window_ = window; } private: - virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE { + virtual void OnTouchEvent(ui::TouchEvent* event) override { // Convert touch event back to root window coordinates. event->ConvertLocationToTarget(window_, window_->GetRootWindow()); dispatcher_->ProcessedTouchEvent(event, window_, ui::ER_UNHANDLED); diff --git a/ui/aura/window_targeter.h b/ui/aura/window_targeter.h index e64ef75..5054c57 100644 --- a/ui/aura/window_targeter.h +++ b/ui/aura/window_targeter.h @@ -20,16 +20,16 @@ class AURA_EXPORT WindowTargeter : public ui::EventTargeter { protected: // ui::EventTargeter: virtual ui::EventTarget* FindTargetForEvent(ui::EventTarget* root, - ui::Event* event) OVERRIDE; + ui::Event* event) override; virtual ui::EventTarget* FindTargetForLocatedEvent( ui::EventTarget* root, - ui::LocatedEvent* event) OVERRIDE; + ui::LocatedEvent* event) override; virtual bool SubtreeCanAcceptEvent( ui::EventTarget* target, - const ui::LocatedEvent& event) const OVERRIDE; + const ui::LocatedEvent& event) const override; virtual bool EventLocationInsideBounds( ui::EventTarget* target, - const ui::LocatedEvent& event) const OVERRIDE; + const ui::LocatedEvent& event) const override; private: Window* FindTargetForKeyEvent(Window* root_window, diff --git a/ui/aura/window_targeter_unittest.cc b/ui/aura/window_targeter_unittest.cc index 86bd8d8..847f567 100644 --- a/ui/aura/window_targeter_unittest.cc +++ b/ui/aura/window_targeter_unittest.cc @@ -23,7 +23,7 @@ class StaticWindowTargeter : public ui::EventTargeter { // ui::EventTargeter: virtual ui::EventTarget* FindTargetForLocatedEvent( ui::EventTarget* root, - ui::LocatedEvent* event) OVERRIDE { + ui::LocatedEvent* event) override { return window_; } diff --git a/ui/aura/window_tracker.h b/ui/aura/window_tracker.h index 6d4545c..3a9650e 100644 --- a/ui/aura/window_tracker.h +++ b/ui/aura/window_tracker.h @@ -37,7 +37,7 @@ class AURA_EXPORT WindowTracker : public WindowObserver { bool Contains(Window* window); // WindowObserver overrides: - virtual void OnWindowDestroying(Window* window) OVERRIDE; + virtual void OnWindowDestroying(Window* window) override; private: Windows windows_; diff --git a/ui/aura/window_tree_host_mac.h b/ui/aura/window_tree_host_mac.h index 8fbf4ec..da502b5 100644 --- a/ui/aura/window_tree_host_mac.h +++ b/ui/aura/window_tree_host_mac.h @@ -30,25 +30,25 @@ class AURA_EXPORT WindowTreeHostMac : public WindowTreeHost { private: // WindowTreeHost Overrides. - virtual ui::EventSource* GetEventSource() OVERRIDE; - virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE; - virtual void Show() OVERRIDE; - virtual void Hide() OVERRIDE; - virtual void ToggleFullScreen() OVERRIDE; - virtual gfx::Rect GetBounds() const OVERRIDE; - virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; - virtual gfx::Insets GetInsets() const OVERRIDE; - virtual void SetInsets(const gfx::Insets& insets) OVERRIDE; - virtual gfx::Point GetLocationOnNativeScreen() const OVERRIDE; - virtual void SetCapture() OVERRIDE; - virtual void ReleaseCapture() OVERRIDE; - virtual bool ConfineCursorToRootWindow() OVERRIDE; - virtual void UnConfineCursor() OVERRIDE; - virtual void SetCursorNative(gfx::NativeCursor cursor_type) OVERRIDE; - virtual void MoveCursorToNative(const gfx::Point& location) OVERRIDE; - virtual void OnCursorVisibilityChangedNative(bool show) OVERRIDE; - virtual void PostNativeEvent(const base::NativeEvent& event) OVERRIDE; - virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE; + virtual ui::EventSource* GetEventSource() override; + virtual gfx::AcceleratedWidget GetAcceleratedWidget() override; + virtual void Show() override; + virtual void Hide() override; + virtual void ToggleFullScreen() override; + virtual gfx::Rect GetBounds() const override; + virtual void SetBounds(const gfx::Rect& bounds) override; + virtual gfx::Insets GetInsets() const override; + virtual void SetInsets(const gfx::Insets& insets) override; + virtual gfx::Point GetLocationOnNativeScreen() const override; + virtual void SetCapture() override; + virtual void ReleaseCapture() override; + virtual bool ConfineCursorToRootWindow() override; + virtual void UnConfineCursor() override; + virtual void SetCursorNative(gfx::NativeCursor cursor_type) override; + virtual void MoveCursorToNative(const gfx::Point& location) override; + virtual void OnCursorVisibilityChangedNative(bool show) override; + virtual void PostNativeEvent(const base::NativeEvent& event) override; + virtual void OnDeviceScaleFactorChanged(float device_scale_factor) override; private: base::scoped_nsobject<NSWindow> window_; diff --git a/ui/aura/window_tree_host_ozone.h b/ui/aura/window_tree_host_ozone.h index 88736f3..f0e8c98 100644 --- a/ui/aura/window_tree_host_ozone.h +++ b/ui/aura/window_tree_host_ozone.h @@ -26,34 +26,34 @@ class AURA_EXPORT WindowTreeHostOzone : public WindowTreeHost, private: // ui::PlatformWindowDelegate: - virtual void OnBoundsChanged(const gfx::Rect&) OVERRIDE; - virtual void OnDamageRect(const gfx::Rect& damaged_region) OVERRIDE; - virtual void DispatchEvent(ui::Event* event) OVERRIDE; - virtual void OnCloseRequest() OVERRIDE; - virtual void OnClosed() OVERRIDE; - virtual void OnWindowStateChanged(ui::PlatformWindowState new_state) OVERRIDE; - virtual void OnLostCapture() OVERRIDE; + virtual void OnBoundsChanged(const gfx::Rect&) override; + virtual void OnDamageRect(const gfx::Rect& damaged_region) override; + virtual void DispatchEvent(ui::Event* event) override; + virtual void OnCloseRequest() override; + virtual void OnClosed() override; + virtual void OnWindowStateChanged(ui::PlatformWindowState new_state) override; + virtual void OnLostCapture() override; virtual void OnAcceleratedWidgetAvailable( - gfx::AcceleratedWidget widget) OVERRIDE; - virtual void OnActivationChanged(bool active) OVERRIDE; + gfx::AcceleratedWidget widget) override; + virtual void OnActivationChanged(bool active) override; // WindowTreeHost: - virtual ui::EventSource* GetEventSource() OVERRIDE; - virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE; - virtual void Show() OVERRIDE; - virtual void Hide() OVERRIDE; - virtual gfx::Rect GetBounds() const OVERRIDE; - virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; - virtual gfx::Point GetLocationOnNativeScreen() const OVERRIDE; - virtual void SetCapture() OVERRIDE; - virtual void ReleaseCapture() OVERRIDE; - virtual void PostNativeEvent(const base::NativeEvent& event) OVERRIDE; - virtual void SetCursorNative(gfx::NativeCursor cursor_type) OVERRIDE; - virtual void MoveCursorToNative(const gfx::Point& location) OVERRIDE; - virtual void OnCursorVisibilityChangedNative(bool show) OVERRIDE; + virtual ui::EventSource* GetEventSource() override; + virtual gfx::AcceleratedWidget GetAcceleratedWidget() override; + virtual void Show() override; + virtual void Hide() override; + virtual gfx::Rect GetBounds() const override; + virtual void SetBounds(const gfx::Rect& bounds) override; + virtual gfx::Point GetLocationOnNativeScreen() const override; + virtual void SetCapture() override; + virtual void ReleaseCapture() override; + virtual void PostNativeEvent(const base::NativeEvent& event) override; + virtual void SetCursorNative(gfx::NativeCursor cursor_type) override; + virtual void MoveCursorToNative(const gfx::Point& location) override; + virtual void OnCursorVisibilityChangedNative(bool show) override; // ui::EventSource overrides. - virtual ui::EventProcessor* GetEventProcessor() OVERRIDE; + virtual ui::EventProcessor* GetEventProcessor() override; // Platform-specific part of this WindowTreeHost. scoped_ptr<ui::PlatformWindow> platform_window_; diff --git a/ui/aura/window_tree_host_win.h b/ui/aura/window_tree_host_win.h index f2c5e85..bfbdc07 100644 --- a/ui/aura/window_tree_host_win.h +++ b/ui/aura/window_tree_host_win.h @@ -24,38 +24,38 @@ class AURA_EXPORT WindowTreeHostWin virtual ~WindowTreeHostWin(); // WindowTreeHost: - virtual ui::EventSource* GetEventSource() OVERRIDE; - virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE; - virtual void Show() OVERRIDE; - virtual void Hide() OVERRIDE; - virtual gfx::Rect GetBounds() const OVERRIDE; - virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; - virtual gfx::Point GetLocationOnNativeScreen() const OVERRIDE; - virtual void SetCapture() OVERRIDE; - virtual void ReleaseCapture() OVERRIDE; - virtual void SetCursorNative(gfx::NativeCursor cursor) OVERRIDE; - virtual void MoveCursorToNative(const gfx::Point& location) OVERRIDE; - virtual void OnCursorVisibilityChangedNative(bool show) OVERRIDE; - virtual void PostNativeEvent(const base::NativeEvent& native_event) OVERRIDE; + virtual ui::EventSource* GetEventSource() override; + virtual gfx::AcceleratedWidget GetAcceleratedWidget() override; + virtual void Show() override; + virtual void Hide() override; + virtual gfx::Rect GetBounds() const override; + virtual void SetBounds(const gfx::Rect& bounds) override; + virtual gfx::Point GetLocationOnNativeScreen() const override; + virtual void SetCapture() override; + virtual void ReleaseCapture() override; + virtual void SetCursorNative(gfx::NativeCursor cursor) override; + virtual void MoveCursorToNative(const gfx::Point& location) override; + virtual void OnCursorVisibilityChangedNative(bool show) override; + virtual void PostNativeEvent(const base::NativeEvent& native_event) override; // ui::EventSource: - virtual ui::EventProcessor* GetEventProcessor() OVERRIDE; + virtual ui::EventProcessor* GetEventProcessor() override; protected: gfx::AcceleratedWidget hwnd() const { return widget_; } private: // ui::PlatformWindowDelegate: - virtual void OnBoundsChanged(const gfx::Rect& new_bounds) OVERRIDE; - virtual void OnDamageRect(const gfx::Rect& damaged_region) OVERRIDE; - virtual void DispatchEvent(ui::Event* event) OVERRIDE; - virtual void OnCloseRequest() OVERRIDE; - virtual void OnClosed() OVERRIDE; - virtual void OnWindowStateChanged(ui::PlatformWindowState new_state) OVERRIDE; - virtual void OnLostCapture() OVERRIDE; + virtual void OnBoundsChanged(const gfx::Rect& new_bounds) override; + virtual void OnDamageRect(const gfx::Rect& damaged_region) override; + virtual void DispatchEvent(ui::Event* event) override; + virtual void OnCloseRequest() override; + virtual void OnClosed() override; + virtual void OnWindowStateChanged(ui::PlatformWindowState new_state) override; + virtual void OnLostCapture() override; virtual void OnAcceleratedWidgetAvailable( - gfx::AcceleratedWidget widget) OVERRIDE; - virtual void OnActivationChanged(bool active) OVERRIDE; + gfx::AcceleratedWidget widget) override; + virtual void OnActivationChanged(bool active) override; bool has_capture_; gfx::Rect bounds_; diff --git a/ui/aura/window_tree_host_x11.cc b/ui/aura/window_tree_host_x11.cc index 35ebb1e..06c3a3f 100644 --- a/ui/aura/window_tree_host_x11.cc +++ b/ui/aura/window_tree_host_x11.cc @@ -202,7 +202,7 @@ class TouchEventCalibrate : public ui::PlatformEventObserver { private: // ui::PlatformEventObserver: - virtual void WillProcessEvent(const ui::PlatformEvent& event) OVERRIDE { + virtual void WillProcessEvent(const ui::PlatformEvent& event) override { #if defined(USE_XI2_MT) if (event->type == GenericEvent && (event->xgeneric.evtype == XI_TouchBegin || @@ -216,7 +216,7 @@ class TouchEventCalibrate : public ui::PlatformEventObserver { #endif // defined(USE_XI2_MT) } - virtual void DidProcessEvent(const ui::PlatformEvent& event) OVERRIDE {} + virtual void DidProcessEvent(const ui::PlatformEvent& event) override {} // The difference in screen's native resolution pixels between // the border of the touchscreen and the border of the screen, diff --git a/ui/aura/window_tree_host_x11.h b/ui/aura/window_tree_host_x11.h index c5a0351..1c05bf0 100644 --- a/ui/aura/window_tree_host_x11.h +++ b/ui/aura/window_tree_host_x11.h @@ -38,26 +38,26 @@ class AURA_EXPORT WindowTreeHostX11 : public WindowTreeHost, virtual ~WindowTreeHostX11(); // ui::PlatformEventDispatcher: - virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE; - virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) OVERRIDE; + virtual bool CanDispatchEvent(const ui::PlatformEvent& event) override; + virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) override; // WindowTreeHost: - virtual ui::EventSource* GetEventSource() OVERRIDE; - virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE; - virtual void Show() OVERRIDE; - virtual void Hide() OVERRIDE; - virtual gfx::Rect GetBounds() const OVERRIDE; - virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; - virtual gfx::Point GetLocationOnNativeScreen() const OVERRIDE; - virtual void SetCapture() OVERRIDE; - virtual void ReleaseCapture() OVERRIDE; - virtual void PostNativeEvent(const base::NativeEvent& event) OVERRIDE; - virtual void SetCursorNative(gfx::NativeCursor cursor_type) OVERRIDE; - virtual void MoveCursorToNative(const gfx::Point& location) OVERRIDE; - virtual void OnCursorVisibilityChangedNative(bool show) OVERRIDE; + virtual ui::EventSource* GetEventSource() override; + virtual gfx::AcceleratedWidget GetAcceleratedWidget() override; + virtual void Show() override; + virtual void Hide() override; + virtual gfx::Rect GetBounds() const override; + virtual void SetBounds(const gfx::Rect& bounds) override; + virtual gfx::Point GetLocationOnNativeScreen() const override; + virtual void SetCapture() override; + virtual void ReleaseCapture() override; + virtual void PostNativeEvent(const base::NativeEvent& event) override; + virtual void SetCursorNative(gfx::NativeCursor cursor_type) override; + virtual void MoveCursorToNative(const gfx::Point& location) override; + virtual void OnCursorVisibilityChangedNative(bool show) override; // ui::EventSource overrides. - virtual ui::EventProcessor* GetEventProcessor() OVERRIDE; + virtual ui::EventProcessor* GetEventProcessor() override; protected: // Called when X Configure Notify event is recevied. diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc index bdc0c7e..a2b9ab0 100644 --- a/ui/aura/window_unittest.cc +++ b/ui/aura/window_unittest.cc @@ -55,7 +55,7 @@ class WindowTest : public AuraTestBase { WindowTest() : max_separation_(0) { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { AuraTestBase::SetUp(); // TODO: there needs to be an easier way to do this. max_separation_ = ui::GestureConfiguration:: @@ -64,7 +64,7 @@ class WindowTest : public AuraTestBase { set_max_separation_for_gesture_touches_in_pixels(0); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { AuraTestBase::TearDown(); ui::GestureConfiguration:: set_max_separation_for_gesture_touches_in_pixels(max_separation_); @@ -94,13 +94,13 @@ class DestroyTrackingDelegateImpl : public TestWindowDelegate { bool in_destroying() const { return in_destroying_; } - virtual void OnWindowDestroying(Window* window) OVERRIDE { + virtual void OnWindowDestroying(Window* window) override { EXPECT_FALSE(in_destroying_); in_destroying_ = true; destroying_count_++; } - virtual void OnWindowDestroyed(Window* window) OVERRIDE { + virtual void OnWindowDestroyed(Window* window) override { EXPECT_TRUE(in_destroying_); in_destroying_ = false; destroyed_count_++; @@ -123,7 +123,7 @@ class ChildWindowDelegateImpl : public DestroyTrackingDelegateImpl { : parent_delegate_(parent_delegate) { } - virtual void OnWindowDestroying(Window* window) OVERRIDE { + virtual void OnWindowDestroying(Window* window) override { EXPECT_TRUE(parent_delegate_->in_destroying()); DestroyTrackingDelegateImpl::OnWindowDestroying(window); } @@ -143,7 +143,7 @@ class DestroyOrphanDelegate : public TestWindowDelegate { void set_window(Window* window) { window_ = window; } - virtual void OnWindowDestroyed(Window* window) OVERRIDE { + virtual void OnWindowDestroyed(Window* window) override { EXPECT_FALSE(window_->parent()); } @@ -175,18 +175,18 @@ class CaptureWindowDelegateImpl : public TestWindowDelegate { int touch_event_count() const { return touch_event_count_; } int gesture_event_count() const { return gesture_event_count_; } - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE { + virtual void OnMouseEvent(ui::MouseEvent* event) override { if (event->type() == ui::ET_MOUSE_CAPTURE_CHANGED) capture_changed_event_count_++; mouse_event_count_++; } - virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE { + virtual void OnTouchEvent(ui::TouchEvent* event) override { touch_event_count_++; } - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE { + virtual void OnGestureEvent(ui::GestureEvent* event) override { gesture_event_count_++; } - virtual void OnCaptureLost() OVERRIDE { + virtual void OnCaptureLost() override { capture_lost_count_++; } @@ -205,7 +205,7 @@ class GestureTrackPositionDelegate : public TestWindowDelegate { public: GestureTrackPositionDelegate() {} - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE { + virtual void OnGestureEvent(ui::GestureEvent* event) override { position_ = event->location(); event->StopPropagation(); } @@ -228,7 +228,7 @@ class SelfEventHandlingWindowDelegate : public TestWindowDelegate { virtual bool ShouldDescendIntoChildForEventHandling( Window* child, - const gfx::Point& location) OVERRIDE { + const gfx::Point& location) override { return false; } @@ -245,7 +245,7 @@ class DestroyWindowDelegate : public TestWindowDelegate { virtual ~DestroyWindowDelegate() {} // Overridden from WindowDelegate. - virtual void OnWindowDestroyed(Window* window) OVERRIDE { + virtual void OnWindowDestroyed(Window* window) override { delete this; } @@ -576,7 +576,7 @@ class AddedToRootWindowObserver : public WindowObserver { public: AddedToRootWindowObserver() : called_(false) {} - virtual void OnWindowAddedToRootWindow(Window* window) OVERRIDE { + virtual void OnWindowAddedToRootWindow(Window* window) override { called_ = true; } @@ -1087,7 +1087,7 @@ class MouseEnterExitWindowDelegate : public TestWindowDelegate { public: MouseEnterExitWindowDelegate() : entered_(false), exited_(false) {} - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE { + virtual void OnMouseEvent(ui::MouseEvent* event) override { switch (event->type()) { case ui::ET_MOUSE_ENTERED: EXPECT_TRUE(event->flags() & ui::EF_IS_SYNTHESIZED); @@ -1372,7 +1372,7 @@ class VisibilityWindowDelegate : public TestWindowDelegate { hidden_ = 0; } - virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE { + virtual void OnWindowTargetVisibilityChanged(bool visible) override { if (visible) shown_++; else @@ -1721,16 +1721,16 @@ class WindowObserverTest : public WindowTest, } private: - virtual void OnWindowAdded(Window* new_window) OVERRIDE { + virtual void OnWindowAdded(Window* new_window) override { added_count_++; } - virtual void OnWillRemoveWindow(Window* window) OVERRIDE { + virtual void OnWillRemoveWindow(Window* window) override { removed_count_++; } virtual void OnWindowVisibilityChanged(Window* window, - bool visible) OVERRIDE { + bool visible) override { if (!visibility_info_) { visibility_info_.reset(new VisibilityInfo); visibility_info_->changed_count = 0; @@ -1740,20 +1740,20 @@ class WindowObserverTest : public WindowTest, visibility_info_->changed_count++; } - virtual void OnWindowDestroyed(Window* window) OVERRIDE { + virtual void OnWindowDestroyed(Window* window) override { EXPECT_FALSE(window->parent()); destroyed_count_++; } virtual void OnWindowPropertyChanged(Window* window, const void* key, - intptr_t old) OVERRIDE { + intptr_t old) override { property_key_ = key; old_property_value_ = old; } virtual void OnAncestorWindowTransformed(Window* source, - Window* window) OVERRIDE { + Window* window) override { transform_notifications_.push_back( std::make_pair(source->id(), window->id())); } @@ -2043,7 +2043,7 @@ class TestVisibilityClient : public client::VisibilityClient { // Overridden from client::VisibilityClient: virtual void UpdateLayerVisibility(aura::Window* window, - bool visible) OVERRIDE { + bool visible) override { if (!ignore_visibility_changes_) window->layer()->SetVisible(visible); } @@ -2179,11 +2179,11 @@ class RootWindowAttachmentObserver : public WindowObserver { } // Overridden from WindowObserver: - virtual void OnWindowAddedToRootWindow(Window* window) OVERRIDE { + virtual void OnWindowAddedToRootWindow(Window* window) override { ++added_count_; } virtual void OnWindowRemovingFromRootWindow(Window* window, - Window* new_root) OVERRIDE { + Window* new_root) override { ++removed_count_; } @@ -2265,7 +2265,7 @@ class BoundsChangedWindowObserver : public WindowObserver { virtual void OnWindowBoundsChanged(Window* window, const gfx::Rect& old_bounds, - const gfx::Rect& new_bounds) OVERRIDE { + const gfx::Rect& new_bounds) override { root_set_ = window->GetRootWindow() != NULL; } @@ -2344,7 +2344,7 @@ class OwningWindowDelegate : public TestWindowDelegate { owned_window_.reset(window); } - virtual void OnWindowDestroyed(Window* window) OVERRIDE { + virtual void OnWindowDestroyed(Window* window) override { owned_window_.reset(NULL); } @@ -2390,7 +2390,7 @@ class BoundsChangeDelegate : public TestWindowDelegate { // Window virtual void OnBoundsChanged(const gfx::Rect& old_bounds, - const gfx::Rect& new_bounds) OVERRIDE { + const gfx::Rect& new_bounds) override { bounds_changed_ = true; } @@ -2498,11 +2498,11 @@ class AddChildNotificationsObserver : public WindowObserver { } // WindowObserver overrides: - virtual void OnWindowAddedToRootWindow(Window* window) OVERRIDE { + virtual void OnWindowAddedToRootWindow(Window* window) override { added_count_++; } virtual void OnWindowRemovingFromRootWindow(Window* window, - Window* new_root) OVERRIDE { + Window* new_root) override { removed_count_++; } @@ -2564,11 +2564,11 @@ class HierarchyObserver : public WindowObserver { private: // Overridden from WindowObserver: virtual void OnWindowHierarchyChanging( - const HierarchyChangeParams& params) OVERRIDE { + const HierarchyChangeParams& params) override { params_.push_back(params); } virtual void OnWindowHierarchyChanged( - const HierarchyChangeParams& params) OVERRIDE { + const HierarchyChangeParams& params) override { params_.push_back(params); } @@ -2949,7 +2949,7 @@ class PaintWindowDelegate : public TestWindowDelegate { int paint_count() const { return paint_count_; } // TestWindowDelegate:: - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { + virtual void OnPaint(gfx::Canvas* canvas) override { paint_count_++; canvas->GetClipBounds(&most_recent_paint_clip_bounds_); const SkMatrix& matrix = canvas->sk_canvas()->getTotalMatrix(); @@ -3425,17 +3425,17 @@ class TestLayerAnimationObserver : public ui::LayerAnimationObserver { private: // ui::LayerAnimationObserver: virtual void OnLayerAnimationEnded( - ui::LayerAnimationSequence* sequence) OVERRIDE { + ui::LayerAnimationSequence* sequence) override { animation_completed_ = true; } virtual void OnLayerAnimationAborted( - ui::LayerAnimationSequence* sequence) OVERRIDE { + ui::LayerAnimationSequence* sequence) override { animation_aborted_ = true; } virtual void OnLayerAnimationScheduled( - ui::LayerAnimationSequence* sequence) OVERRIDE { + ui::LayerAnimationSequence* sequence) override { } bool animation_completed_; diff --git a/ui/base/accelerators/accelerator_manager_unittest.cc b/ui/base/accelerators/accelerator_manager_unittest.cc index b8672ec..979ff4a 100644 --- a/ui/base/accelerators/accelerator_manager_unittest.cc +++ b/ui/base/accelerators/accelerator_manager_unittest.cc @@ -28,8 +28,8 @@ class TestTarget : public AcceleratorTarget { } // Overridden from AcceleratorTarget: - virtual bool AcceleratorPressed(const Accelerator& accelerator) OVERRIDE; - virtual bool CanHandleAccelerators() const OVERRIDE; + virtual bool AcceleratorPressed(const Accelerator& accelerator) override; + virtual bool CanHandleAccelerators() const override; private: int accelerator_pressed_count_; diff --git a/ui/base/accelerators/platform_accelerator_cocoa.h b/ui/base/accelerators/platform_accelerator_cocoa.h index 3f72cac..f14bc4d 100644 --- a/ui/base/accelerators/platform_accelerator_cocoa.h +++ b/ui/base/accelerators/platform_accelerator_cocoa.h @@ -20,8 +20,8 @@ class UI_BASE_EXPORT PlatformAcceleratorCocoa : public PlatformAccelerator { virtual ~PlatformAcceleratorCocoa(); // PlatformAccelerator: - virtual scoped_ptr<PlatformAccelerator> CreateCopy() const OVERRIDE; - virtual bool Equals(const PlatformAccelerator& rhs) const OVERRIDE; + virtual scoped_ptr<PlatformAccelerator> CreateCopy() const override; + virtual bool Equals(const PlatformAccelerator& rhs) const override; // The keyEquivalent of the NSMenuItem associated with the accelerator. NSString* characters() const { return characters_.get(); } diff --git a/ui/base/clipboard/clipboard_aurax11.cc b/ui/base/clipboard/clipboard_aurax11.cc index e40af36..82542e0 100644 --- a/ui/base/clipboard/clipboard_aurax11.cc +++ b/ui/base/clipboard/clipboard_aurax11.cc @@ -77,8 +77,8 @@ class SelectionChangeObserver : public ui::PlatformEventObserver { virtual ~SelectionChangeObserver(); // ui::PlatformEventObserver: - virtual void WillProcessEvent(const ui::PlatformEvent& event) OVERRIDE; - virtual void DidProcessEvent(const ui::PlatformEvent& event) OVERRIDE {} + virtual void WillProcessEvent(const ui::PlatformEvent& event) override; + virtual void DidProcessEvent(const ui::PlatformEvent& event) override {} int event_base_; Atom clipboard_atom_; @@ -290,8 +290,8 @@ class Clipboard::AuraX11Details : public PlatformEventDispatcher { private: // PlatformEventDispatcher: - virtual bool CanDispatchEvent(const PlatformEvent& event) OVERRIDE; - virtual uint32_t DispatchEvent(const PlatformEvent& event) OVERRIDE; + virtual bool CanDispatchEvent(const PlatformEvent& event) override; + virtual uint32_t DispatchEvent(const PlatformEvent& event) override; // Our X11 state. Display* x_display_; diff --git a/ui/base/cocoa/controls/blue_label_button_unittest.mm b/ui/base/cocoa/controls/blue_label_button_unittest.mm index 1e2a8f8..2166d30 100644 --- a/ui/base/cocoa/controls/blue_label_button_unittest.mm +++ b/ui/base/cocoa/controls/blue_label_button_unittest.mm @@ -16,7 +16,7 @@ class BlueLabelButtonTest : public ui::CocoaTest { BlueLabelButtonTest() {} // ui::CocoaTest override: - virtual void SetUp() OVERRIDE; + virtual void SetUp() override; protected: base::scoped_nsobject<BlueLabelButton> blue_label_button_; diff --git a/ui/base/cocoa/controls/hover_image_menu_button_unittest.mm b/ui/base/cocoa/controls/hover_image_menu_button_unittest.mm index ad5b2da..ffe46be 100644 --- a/ui/base/cocoa/controls/hover_image_menu_button_unittest.mm +++ b/ui/base/cocoa/controls/hover_image_menu_button_unittest.mm @@ -20,7 +20,7 @@ class HoverImageMenuButtonTest : public CocoaTest { HoverImageMenuButtonTest() {} // CocoaTest override: - virtual void SetUp() OVERRIDE; + virtual void SetUp() override; protected: base::scoped_nsobject<HoverImageMenuButton> menu_button_; diff --git a/ui/base/cocoa/menu_controller_unittest.mm b/ui/base/cocoa/menu_controller_unittest.mm index 56e610e..161bf28 100644 --- a/ui/base/cocoa/menu_controller_unittest.mm +++ b/ui/base/cocoa/menu_controller_unittest.mm @@ -39,21 +39,21 @@ class Delegate : public SimpleMenuModel::Delegate { did_close_(false) { } - virtual bool IsCommandIdChecked(int command_id) const OVERRIDE { + virtual bool IsCommandIdChecked(int command_id) const override { return false; } - virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE { + virtual bool IsCommandIdEnabled(int command_id) const override { ++enable_count_; return true; } virtual bool GetAcceleratorForCommandId( int command_id, - Accelerator* accelerator) OVERRIDE { return false; } - virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE { + Accelerator* accelerator) override { return false; } + virtual void ExecuteCommand(int command_id, int event_flags) override { ++execute_count_; } - virtual void MenuWillShow(SimpleMenuModel* /*source*/) OVERRIDE { + virtual void MenuWillShow(SimpleMenuModel* /*source*/) override { EXPECT_FALSE(did_show_); EXPECT_FALSE(did_close_); did_show_ = true; @@ -66,7 +66,7 @@ class Delegate : public SimpleMenuModel::Delegate { inModes:modes]; } - virtual void MenuClosed(SimpleMenuModel* /*source*/) OVERRIDE { + virtual void MenuClosed(SimpleMenuModel* /*source*/) override { EXPECT_TRUE(did_show_); EXPECT_FALSE(did_close_); did_close_ = true; @@ -86,15 +86,15 @@ class Delegate : public SimpleMenuModel::Delegate { class DynamicDelegate : public Delegate { public: DynamicDelegate() {} - virtual bool IsItemForCommandIdDynamic(int command_id) const OVERRIDE { + virtual bool IsItemForCommandIdDynamic(int command_id) const override { return true; } - virtual base::string16 GetLabelForCommandId(int command_id) const OVERRIDE { + virtual base::string16 GetLabelForCommandId(int command_id) const override { return label_; } virtual bool GetIconForCommandId( int command_id, - gfx::Image* icon) const OVERRIDE { + gfx::Image* icon) const override { if (icon_.IsEmpty()) { return false; } else { @@ -121,7 +121,7 @@ class FontListMenuModel : public SimpleMenuModel { index_(index) { } virtual ~FontListMenuModel() {} - virtual const gfx::FontList* GetLabelFontListAt(int index) const OVERRIDE { + virtual const gfx::FontList* GetLabelFontListAt(int index) const override { return (index == index_) ? font_list_ : NULL; } diff --git a/ui/base/cursor/cursor_loader_ozone.h b/ui/base/cursor/cursor_loader_ozone.h index 402cdc2..7aef431 100644 --- a/ui/base/cursor/cursor_loader_ozone.h +++ b/ui/base/cursor/cursor_loader_ozone.h @@ -20,13 +20,13 @@ class UI_BASE_EXPORT CursorLoaderOzone : public CursorLoader { // CursorLoader overrides: virtual void LoadImageCursor(int id, int resource_id, - const gfx::Point& hot) OVERRIDE; + const gfx::Point& hot) override; virtual void LoadAnimatedCursor(int id, int resource_id, const gfx::Point& hot, - int frame_delay_ms) OVERRIDE; - virtual void UnloadAll() OVERRIDE; - virtual void SetPlatformCursor(gfx::NativeCursor* cursor) OVERRIDE; + int frame_delay_ms) override; + virtual void UnloadAll() override; + virtual void SetPlatformCursor(gfx::NativeCursor* cursor) override; private: // Pointers are owned by ResourceBundle and must not be freed here. diff --git a/ui/base/cursor/cursor_loader_win.h b/ui/base/cursor/cursor_loader_win.h index adcc0ae..c886af0 100644 --- a/ui/base/cursor/cursor_loader_win.h +++ b/ui/base/cursor/cursor_loader_win.h @@ -18,13 +18,13 @@ class UI_BASE_EXPORT CursorLoaderWin : public CursorLoader { // Overridden from CursorLoader: virtual void LoadImageCursor(int id, int resource_id, - const gfx::Point& hot) OVERRIDE; + const gfx::Point& hot) override; virtual void LoadAnimatedCursor(int id, int resource_id, const gfx::Point& hot, - int frame_delay_ms) OVERRIDE; - virtual void UnloadAll() OVERRIDE; - virtual void SetPlatformCursor(gfx::NativeCursor* cursor) OVERRIDE; + int frame_delay_ms) override; + virtual void UnloadAll() override; + virtual void SetPlatformCursor(gfx::NativeCursor* cursor) override; // Used to pass the cursor resource module name to the cursor loader. This is // typically used to load non system cursors. diff --git a/ui/base/cursor/cursor_loader_x11.h b/ui/base/cursor/cursor_loader_x11.h index 331529b..2667221 100644 --- a/ui/base/cursor/cursor_loader_x11.h +++ b/ui/base/cursor/cursor_loader_x11.h @@ -25,13 +25,13 @@ class UI_BASE_EXPORT CursorLoaderX11 : public CursorLoader { // Overridden from CursorLoader: virtual void LoadImageCursor(int id, int resource_id, - const gfx::Point& hot) OVERRIDE; + const gfx::Point& hot) override; virtual void LoadAnimatedCursor(int id, int resource_id, const gfx::Point& hot, - int frame_delay_ms) OVERRIDE; - virtual void UnloadAll() OVERRIDE; - virtual void SetPlatformCursor(gfx::NativeCursor* cursor) OVERRIDE; + int frame_delay_ms) override; + virtual void UnloadAll() override; + virtual void SetPlatformCursor(gfx::NativeCursor* cursor) override; const XcursorImage* GetXcursorImageForTest(int id); diff --git a/ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h b/ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h index dc51602..037fd08 100644 --- a/ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h +++ b/ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h @@ -60,15 +60,15 @@ class UI_BASE_EXPORT BitmapCursorFactoryOzone : public CursorFactoryOzone { PlatformCursor platform_cursor); // CursorFactoryOzone: - virtual PlatformCursor GetDefaultCursor(int type) OVERRIDE; + virtual PlatformCursor GetDefaultCursor(int type) override; virtual PlatformCursor CreateImageCursor(const SkBitmap& bitmap, - const gfx::Point& hotspot) OVERRIDE; + const gfx::Point& hotspot) override; virtual PlatformCursor CreateAnimatedCursor( const std::vector<SkBitmap>& bitmaps, const gfx::Point& hotspot, - int frame_delay_ms) OVERRIDE; - virtual void RefImageCursor(PlatformCursor cursor) OVERRIDE; - virtual void UnrefImageCursor(PlatformCursor cursor) OVERRIDE; + int frame_delay_ms) override; + virtual void RefImageCursor(PlatformCursor cursor) override; + virtual void UnrefImageCursor(PlatformCursor cursor) override; private: // Get cached BitmapCursorOzone for a default cursor. diff --git a/ui/base/default_theme_provider.h b/ui/base/default_theme_provider.h index 8bf2a01..0fe64d1 100644 --- a/ui/base/default_theme_provider.h +++ b/ui/base/default_theme_provider.h @@ -24,22 +24,22 @@ class UI_BASE_EXPORT DefaultThemeProvider : public ThemeProvider { virtual ~DefaultThemeProvider(); // Overridden from ui::ThemeProvider: - virtual bool UsingSystemTheme() const OVERRIDE; - virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const OVERRIDE; - virtual SkColor GetColor(int id) const OVERRIDE; - virtual int GetDisplayProperty(int id) const OVERRIDE; - virtual bool ShouldUseNativeFrame() const OVERRIDE; - virtual bool HasCustomImage(int id) const OVERRIDE; + virtual bool UsingSystemTheme() const override; + virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const override; + virtual SkColor GetColor(int id) const override; + virtual int GetDisplayProperty(int id) const override; + virtual bool ShouldUseNativeFrame() const override; + virtual bool HasCustomImage(int id) const override; virtual base::RefCountedMemory* GetRawData( int id, - ui::ScaleFactor scale_factor) const OVERRIDE; + ui::ScaleFactor scale_factor) const override; #if defined(OS_MACOSX) - virtual NSImage* GetNSImageNamed(int id) const OVERRIDE; - virtual NSColor* GetNSImageColorNamed(int id) const OVERRIDE; - virtual NSColor* GetNSColor(int id) const OVERRIDE; - virtual NSColor* GetNSColorTint(int id) const OVERRIDE; - virtual NSGradient* GetNSGradient(int id) const OVERRIDE; + virtual NSImage* GetNSImageNamed(int id) const override; + virtual NSColor* GetNSImageColorNamed(int id) const override; + virtual NSColor* GetNSColor(int id) const override; + virtual NSColor* GetNSColorTint(int id) const override; + virtual NSGradient* GetNSGradient(int id) const override; #endif private: diff --git a/ui/base/dragdrop/drag_utils.cc b/ui/base/dragdrop/drag_utils.cc index 53f3e99..363dad4 100644 --- a/ui/base/dragdrop/drag_utils.cc +++ b/ui/base/dragdrop/drag_utils.cc @@ -40,7 +40,7 @@ class FileDragImageSource : public gfx::CanvasImageSource { } // Overridden from gfx::CanvasImageSource. - virtual void Draw(gfx::Canvas* canvas) OVERRIDE { + virtual void Draw(gfx::Canvas* canvas) override { if (!icon_.isNull()) { // Paint the icon. canvas->DrawImageInt(icon_, (size().width() - icon_.width()) / 2, 0); diff --git a/ui/base/dragdrop/os_exchange_data_provider_aura.h b/ui/base/dragdrop/os_exchange_data_provider_aura.h index e54a2fd..88218a2 100644 --- a/ui/base/dragdrop/os_exchange_data_provider_aura.h +++ b/ui/base/dragdrop/os_exchange_data_provider_aura.h @@ -26,38 +26,38 @@ class UI_BASE_EXPORT OSExchangeDataProviderAura virtual ~OSExchangeDataProviderAura(); // Overridden from OSExchangeData::Provider: - virtual Provider* Clone() const OVERRIDE; - virtual void MarkOriginatedFromRenderer() OVERRIDE; - virtual bool DidOriginateFromRenderer() const OVERRIDE; - virtual void SetString(const base::string16& data) OVERRIDE; - virtual void SetURL(const GURL& url, const base::string16& title) OVERRIDE; - virtual void SetFilename(const base::FilePath& path) OVERRIDE; - virtual void SetFilenames(const std::vector<FileInfo>& filenames) OVERRIDE; + virtual Provider* Clone() const override; + virtual void MarkOriginatedFromRenderer() override; + virtual bool DidOriginateFromRenderer() const override; + virtual void SetString(const base::string16& data) override; + virtual void SetURL(const GURL& url, const base::string16& title) override; + virtual void SetFilename(const base::FilePath& path) override; + virtual void SetFilenames(const std::vector<FileInfo>& filenames) override; virtual void SetPickledData(const OSExchangeData::CustomFormat& format, - const Pickle& data) OVERRIDE; - virtual bool GetString(base::string16* data) const OVERRIDE; + const Pickle& data) override; + virtual bool GetString(base::string16* data) const override; virtual bool GetURLAndTitle(OSExchangeData::FilenameToURLPolicy policy, GURL* url, - base::string16* title) const OVERRIDE; - virtual bool GetFilename(base::FilePath* path) const OVERRIDE; - virtual bool GetFilenames(std::vector<FileInfo>* filenames) const OVERRIDE; + base::string16* title) const override; + virtual bool GetFilename(base::FilePath* path) const override; + virtual bool GetFilenames(std::vector<FileInfo>* filenames) const override; virtual bool GetPickledData(const OSExchangeData::CustomFormat& format, - Pickle* data) const OVERRIDE; - virtual bool HasString() const OVERRIDE; + Pickle* data) const override; + virtual bool HasString() const override; virtual bool HasURL(OSExchangeData::FilenameToURLPolicy policy) const - OVERRIDE; - virtual bool HasFile() const OVERRIDE; + override; + virtual bool HasFile() const override; virtual bool HasCustomFormat(const OSExchangeData::CustomFormat& format) const - OVERRIDE; + override; virtual void SetHtml(const base::string16& html, - const GURL& base_url) OVERRIDE; - virtual bool GetHtml(base::string16* html, GURL* base_url) const OVERRIDE; - virtual bool HasHtml() const OVERRIDE; + const GURL& base_url) override; + virtual bool GetHtml(base::string16* html, GURL* base_url) const override; + virtual bool HasHtml() const override; virtual void SetDragImage(const gfx::ImageSkia& image, - const gfx::Vector2d& cursor_offset) OVERRIDE; - virtual const gfx::ImageSkia& GetDragImage() const OVERRIDE; - virtual const gfx::Vector2d& GetDragImageOffset() const OVERRIDE; + const gfx::Vector2d& cursor_offset) override; + virtual const gfx::ImageSkia& GetDragImage() const override; + virtual const gfx::Vector2d& GetDragImageOffset() const override; private: typedef std::map<OSExchangeData::CustomFormat, Pickle> PickleData; diff --git a/ui/base/dragdrop/os_exchange_data_provider_aurax11.h b/ui/base/dragdrop/os_exchange_data_provider_aurax11.h index 702cc7e..9664b02 100644 --- a/ui/base/dragdrop/os_exchange_data_provider_aurax11.h +++ b/ui/base/dragdrop/os_exchange_data_provider_aurax11.h @@ -61,45 +61,45 @@ class UI_BASE_EXPORT OSExchangeDataProviderAuraX11 } // Overridden from OSExchangeData::Provider: - virtual Provider* Clone() const OVERRIDE; - virtual void MarkOriginatedFromRenderer() OVERRIDE; - virtual bool DidOriginateFromRenderer() const OVERRIDE; - virtual void SetString(const base::string16& data) OVERRIDE; - virtual void SetURL(const GURL& url, const base::string16& title) OVERRIDE; - virtual void SetFilename(const base::FilePath& path) OVERRIDE; - virtual void SetFilenames(const std::vector<FileInfo>& filenames) OVERRIDE; + virtual Provider* Clone() const override; + virtual void MarkOriginatedFromRenderer() override; + virtual bool DidOriginateFromRenderer() const override; + virtual void SetString(const base::string16& data) override; + virtual void SetURL(const GURL& url, const base::string16& title) override; + virtual void SetFilename(const base::FilePath& path) override; + virtual void SetFilenames(const std::vector<FileInfo>& filenames) override; virtual void SetPickledData(const OSExchangeData::CustomFormat& format, - const Pickle& pickle) OVERRIDE; - virtual bool GetString(base::string16* data) const OVERRIDE; + const Pickle& pickle) override; + virtual bool GetString(base::string16* data) const override; virtual bool GetURLAndTitle(OSExchangeData::FilenameToURLPolicy policy, GURL* url, - base::string16* title) const OVERRIDE; - virtual bool GetFilename(base::FilePath* path) const OVERRIDE; - virtual bool GetFilenames(std::vector<FileInfo>* filenames) const OVERRIDE; + base::string16* title) const override; + virtual bool GetFilename(base::FilePath* path) const override; + virtual bool GetFilenames(std::vector<FileInfo>* filenames) const override; virtual bool GetPickledData(const OSExchangeData::CustomFormat& format, - Pickle* pickle) const OVERRIDE; - virtual bool HasString() const OVERRIDE; + Pickle* pickle) const override; + virtual bool HasString() const override; virtual bool HasURL(OSExchangeData::FilenameToURLPolicy policy) const - OVERRIDE; - virtual bool HasFile() const OVERRIDE; + override; + virtual bool HasFile() const override; virtual bool HasCustomFormat(const OSExchangeData::CustomFormat& format) const - OVERRIDE; + override; virtual void SetFileContents(const base::FilePath& filename, - const std::string& file_contents) OVERRIDE; + const std::string& file_contents) override; virtual void SetHtml(const base::string16& html, - const GURL& base_url) OVERRIDE; - virtual bool GetHtml(base::string16* html, GURL* base_url) const OVERRIDE; - virtual bool HasHtml() const OVERRIDE; + const GURL& base_url) override; + virtual bool GetHtml(base::string16* html, GURL* base_url) const override; + virtual bool HasHtml() const override; virtual void SetDragImage(const gfx::ImageSkia& image, - const gfx::Vector2d& cursor_offset) OVERRIDE; - virtual const gfx::ImageSkia& GetDragImage() const OVERRIDE; - virtual const gfx::Vector2d& GetDragImageOffset() const OVERRIDE; + const gfx::Vector2d& cursor_offset) override; + virtual const gfx::ImageSkia& GetDragImage() const override; + virtual const gfx::Vector2d& GetDragImageOffset() const override; // ui::PlatformEventDispatcher: - virtual bool CanDispatchEvent(const PlatformEvent& event) OVERRIDE; - virtual uint32_t DispatchEvent(const PlatformEvent& event) OVERRIDE; + virtual bool CanDispatchEvent(const PlatformEvent& event) override; + virtual uint32_t DispatchEvent(const PlatformEvent& event) override; private: friend class OSExchangeDataProviderAuraX11Test; diff --git a/ui/base/dragdrop/os_exchange_data_provider_mac.h b/ui/base/dragdrop/os_exchange_data_provider_mac.h index 1e46e2e..911973e 100644 --- a/ui/base/dragdrop/os_exchange_data_provider_mac.h +++ b/ui/base/dragdrop/os_exchange_data_provider_mac.h @@ -21,29 +21,29 @@ class UI_BASE_EXPORT OSExchangeDataProviderMac virtual ~OSExchangeDataProviderMac(); // Overridden from OSExchangeData::Provider: - virtual Provider* Clone() const OVERRIDE; - virtual void MarkOriginatedFromRenderer() OVERRIDE; - virtual bool DidOriginateFromRenderer() const OVERRIDE; - virtual void SetString(const base::string16& data) OVERRIDE; - virtual void SetURL(const GURL& url, const base::string16& title) OVERRIDE; - virtual void SetFilename(const base::FilePath& path) OVERRIDE; - virtual void SetFilenames(const std::vector<FileInfo>& filenames) OVERRIDE; + virtual Provider* Clone() const override; + virtual void MarkOriginatedFromRenderer() override; + virtual bool DidOriginateFromRenderer() const override; + virtual void SetString(const base::string16& data) override; + virtual void SetURL(const GURL& url, const base::string16& title) override; + virtual void SetFilename(const base::FilePath& path) override; + virtual void SetFilenames(const std::vector<FileInfo>& filenames) override; virtual void SetPickledData(const OSExchangeData::CustomFormat& format, - const Pickle& data) OVERRIDE; - virtual bool GetString(base::string16* data) const OVERRIDE; + const Pickle& data) override; + virtual bool GetString(base::string16* data) const override; virtual bool GetURLAndTitle(OSExchangeData::FilenameToURLPolicy policy, GURL* url, - base::string16* title) const OVERRIDE; - virtual bool GetFilename(base::FilePath* path) const OVERRIDE; - virtual bool GetFilenames(std::vector<FileInfo>* filenames) const OVERRIDE; + base::string16* title) const override; + virtual bool GetFilename(base::FilePath* path) const override; + virtual bool GetFilenames(std::vector<FileInfo>* filenames) const override; virtual bool GetPickledData(const OSExchangeData::CustomFormat& format, - Pickle* data) const OVERRIDE; - virtual bool HasString() const OVERRIDE; + Pickle* data) const override; + virtual bool HasString() const override; virtual bool HasURL( - OSExchangeData::FilenameToURLPolicy policy) const OVERRIDE; - virtual bool HasFile() const OVERRIDE; + OSExchangeData::FilenameToURLPolicy policy) const override; + virtual bool HasFile() const override; virtual bool HasCustomFormat( - const OSExchangeData::CustomFormat& format) const OVERRIDE; + const OSExchangeData::CustomFormat& format) const override; private: base::scoped_nsobject<NSPasteboard> pasteboard_; diff --git a/ui/base/dragdrop/os_exchange_data_provider_win.cc b/ui/base/dragdrop/os_exchange_data_provider_win.cc index 669d850..d283394 100644 --- a/ui/base/dragdrop/os_exchange_data_provider_win.cc +++ b/ui/base/dragdrop/os_exchange_data_provider_win.cc @@ -63,7 +63,7 @@ static STGMEDIUM* GetStorageForFileDescriptor(const base::FilePath& path); // some sort of sequential data (why not just use an array?). See comments // throughout. // -class FormatEtcEnumerator FINAL : public IEnumFORMATETC { +class FormatEtcEnumerator final : public IEnumFORMATETC { public: FormatEtcEnumerator(DataObjectImpl::StoredData::const_iterator begin, DataObjectImpl::StoredData::const_iterator end); diff --git a/ui/base/dragdrop/os_exchange_data_provider_win.h b/ui/base/dragdrop/os_exchange_data_provider_win.h index a89deb2..8587bd1 100644 --- a/ui/base/dragdrop/os_exchange_data_provider_win.h +++ b/ui/base/dragdrop/os_exchange_data_provider_win.h @@ -182,9 +182,9 @@ class UI_BASE_EXPORT OSExchangeDataProviderWin virtual void SetDownloadFileInfo( const OSExchangeData::DownloadFileInfo& download_info); virtual void SetDragImage(const gfx::ImageSkia& image, - const gfx::Vector2d& cursor_offset) OVERRIDE; - virtual const gfx::ImageSkia& GetDragImage() const OVERRIDE; - virtual const gfx::Vector2d& GetDragImageOffset() const OVERRIDE; + const gfx::Vector2d& cursor_offset) override; + virtual const gfx::ImageSkia& GetDragImage() const override; + virtual const gfx::Vector2d& GetDragImageOffset() const override; private: scoped_refptr<DataObjectImpl> data_; diff --git a/ui/base/ime/chromeos/ime_bridge.cc b/ui/base/ime/chromeos/ime_bridge.cc index 49d0f73..98f997ec 100644 --- a/ui/base/ime/chromeos/ime_bridge.cc +++ b/ui/base/ime/chromeos/ime_bridge.cc @@ -27,46 +27,46 @@ class IMEBridgeImpl : public IMEBridge { // IMEBridge override. virtual IMEInputContextHandlerInterface* - GetInputContextHandler() const OVERRIDE { + GetInputContextHandler() const override { return input_context_handler_; } // IMEBridge override. virtual void SetInputContextHandler( - IMEInputContextHandlerInterface* handler) OVERRIDE { + IMEInputContextHandlerInterface* handler) override { input_context_handler_ = handler; } // IMEBridge override. virtual void SetCurrentEngineHandler( - IMEEngineHandlerInterface* handler) OVERRIDE { + IMEEngineHandlerInterface* handler) override { engine_handler_ = handler; } // IMEBridge override. - virtual IMEEngineHandlerInterface* GetCurrentEngineHandler() const OVERRIDE { + virtual IMEEngineHandlerInterface* GetCurrentEngineHandler() const override { return engine_handler_; } // IMEBridge override. virtual IMECandidateWindowHandlerInterface* GetCandidateWindowHandler() const - OVERRIDE { + override { return candidate_window_handler_; } // IMEBridge override. virtual void SetCandidateWindowHandler( - IMECandidateWindowHandlerInterface* handler) OVERRIDE { + IMECandidateWindowHandlerInterface* handler) override { candidate_window_handler_ = handler; } // IMEBridge override. - virtual void SetCurrentTextInputType(ui::TextInputType input_type) OVERRIDE { + virtual void SetCurrentTextInputType(ui::TextInputType input_type) override { current_text_input_ = input_type; } // IMEBridge override. - virtual ui::TextInputType GetCurrentTextInputType() const OVERRIDE { + virtual ui::TextInputType GetCurrentTextInputType() const override { return current_text_input_; } diff --git a/ui/base/ime/chromeos/mock_ime_candidate_window_handler.h b/ui/base/ime/chromeos/mock_ime_candidate_window_handler.h index a7705e3..9bac92c 100644 --- a/ui/base/ime/chromeos/mock_ime_candidate_window_handler.h +++ b/ui/base/ime/chromeos/mock_ime_candidate_window_handler.h @@ -30,11 +30,11 @@ class UI_BASE_EXPORT MockIMECandidateWindowHandler // IMECandidateWindowHandlerInterface override. virtual void UpdateLookupTable( const ui::CandidateWindow& candidate_window, - bool visible) OVERRIDE; + bool visible) override; virtual void UpdatePreeditText( - const base::string16& text, uint32 cursor_pos, bool visible) OVERRIDE; + const base::string16& text, uint32 cursor_pos, bool visible) override; virtual void SetCursorBounds(const gfx::Rect& cursor_bounds, - const gfx::Rect& composition_head) OVERRIDE; + const gfx::Rect& composition_head) override; int set_cursor_bounds_call_count() const { return set_cursor_bounds_call_count_; diff --git a/ui/base/ime/chromeos/mock_ime_engine_handler.h b/ui/base/ime/chromeos/mock_ime_engine_handler.h index 112c0dd..798cde6 100644 --- a/ui/base/ime/chromeos/mock_ime_engine_handler.h +++ b/ui/base/ime/chromeos/mock_ime_engine_handler.h @@ -16,17 +16,17 @@ class UI_BASE_EXPORT MockIMEEngineHandler : public IMEEngineHandlerInterface { MockIMEEngineHandler(); virtual ~MockIMEEngineHandler(); - virtual void FocusIn(const 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 FocusIn(const 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; + const KeyEventDoneCallback& callback) override; + virtual void CandidateClicked(uint32 index) override; virtual void SetSurroundingText(const std::string& text, uint32 cursor_pos, - uint32 anchor_pos) OVERRIDE; + uint32 anchor_pos) override; int focus_in_call_count() const { return focus_in_call_count_; } int focus_out_call_count() const { return focus_out_call_count_; } diff --git a/ui/base/ime/chromeos/mock_ime_input_context_handler.h b/ui/base/ime/chromeos/mock_ime_input_context_handler.h index 71fe395..8e18dec 100644 --- a/ui/base/ime/chromeos/mock_ime_input_context_handler.h +++ b/ui/base/ime/chromeos/mock_ime_input_context_handler.h @@ -28,11 +28,11 @@ class UI_BASE_EXPORT MockIMEInputContextHandler MockIMEInputContextHandler(); virtual ~MockIMEInputContextHandler(); - virtual void CommitText(const std::string& text) OVERRIDE; + virtual void CommitText(const std::string& text) override; virtual void UpdateCompositionText(const CompositionText& text, uint32 cursor_pos, - bool visible) OVERRIDE; - virtual void DeleteSurroundingText(int32 offset, uint32 length) OVERRIDE; + bool visible) override; + virtual void DeleteSurroundingText(int32 offset, uint32 length) override; int commit_text_call_count() const { return commit_text_call_count_; } diff --git a/ui/base/ime/dummy_input_method.h b/ui/base/ime/dummy_input_method.h index 39b0419..a0037f5 100644 --- a/ui/base/ime/dummy_input_method.h +++ b/ui/base/ime/dummy_input_method.h @@ -18,30 +18,30 @@ class DummyInputMethod : public InputMethod { // InputMethod overrides: virtual void SetDelegate( - internal::InputMethodDelegate* delegate) OVERRIDE; - virtual void Init(bool focused) OVERRIDE; - virtual void OnFocus() OVERRIDE; - virtual void OnBlur() OVERRIDE; + internal::InputMethodDelegate* delegate) override; + virtual void Init(bool focused) override; + virtual void OnFocus() override; + virtual void OnBlur() override; virtual bool OnUntranslatedIMEMessage( - const base::NativeEvent& event, NativeEventResult* result) OVERRIDE; - virtual void SetFocusedTextInputClient(TextInputClient* client) OVERRIDE; - virtual void DetachTextInputClient(TextInputClient* client) OVERRIDE; - virtual TextInputClient* GetTextInputClient() const OVERRIDE; - virtual bool DispatchKeyEvent(const ui::KeyEvent& event) OVERRIDE; - virtual void OnTextInputTypeChanged(const TextInputClient* client) OVERRIDE; - virtual void OnCaretBoundsChanged(const TextInputClient* client) OVERRIDE; - virtual void CancelComposition(const TextInputClient* client) OVERRIDE; - virtual void OnInputLocaleChanged() OVERRIDE; - virtual std::string GetInputLocale() OVERRIDE; - virtual bool IsActive() OVERRIDE; - virtual TextInputType GetTextInputType() const OVERRIDE; - virtual TextInputMode GetTextInputMode() const OVERRIDE; - virtual bool CanComposeInline() const OVERRIDE; - virtual bool IsCandidatePopupOpen() const OVERRIDE; - virtual void ShowImeIfNeeded() OVERRIDE; - - virtual void AddObserver(InputMethodObserver* observer) OVERRIDE; - virtual void RemoveObserver(InputMethodObserver* observer) OVERRIDE; + const base::NativeEvent& event, NativeEventResult* result) override; + virtual void SetFocusedTextInputClient(TextInputClient* client) override; + virtual void DetachTextInputClient(TextInputClient* client) override; + virtual TextInputClient* GetTextInputClient() const override; + virtual bool DispatchKeyEvent(const ui::KeyEvent& event) override; + virtual void OnTextInputTypeChanged(const TextInputClient* client) override; + virtual void OnCaretBoundsChanged(const TextInputClient* client) override; + virtual void CancelComposition(const TextInputClient* client) override; + virtual void OnInputLocaleChanged() override; + virtual std::string GetInputLocale() override; + virtual bool IsActive() override; + virtual TextInputType GetTextInputType() const override; + virtual TextInputMode GetTextInputMode() const override; + virtual bool CanComposeInline() const override; + virtual bool IsCandidatePopupOpen() const override; + virtual void ShowImeIfNeeded() override; + + virtual void AddObserver(InputMethodObserver* observer) override; + virtual void RemoveObserver(InputMethodObserver* observer) override; private: DISALLOW_COPY_AND_ASSIGN(DummyInputMethod); diff --git a/ui/base/ime/dummy_input_method_delegate.h b/ui/base/ime/dummy_input_method_delegate.h index ce64216..5055500 100644 --- a/ui/base/ime/dummy_input_method_delegate.h +++ b/ui/base/ime/dummy_input_method_delegate.h @@ -18,7 +18,7 @@ class UI_BASE_EXPORT DummyInputMethodDelegate : public InputMethodDelegate { virtual ~DummyInputMethodDelegate(); // Overridden from InputMethodDelegate: - virtual bool DispatchKeyEventPostIME(const ui::KeyEvent& key_event) OVERRIDE; + virtual bool DispatchKeyEventPostIME(const ui::KeyEvent& key_event) override; private: DISALLOW_COPY_AND_ASSIGN(DummyInputMethodDelegate); diff --git a/ui/base/ime/dummy_text_input_client.h b/ui/base/ime/dummy_text_input_client.h index be2295c..92705cb 100644 --- a/ui/base/ime/dummy_text_input_client.h +++ b/ui/base/ime/dummy_text_input_client.h @@ -17,36 +17,36 @@ class DummyTextInputClient : public TextInputClient { virtual ~DummyTextInputClient(); // Overriden from TextInputClient. - virtual void SetCompositionText(const CompositionText& composition) OVERRIDE; - virtual void ConfirmCompositionText() OVERRIDE; - virtual void ClearCompositionText() OVERRIDE; - virtual void InsertText(const base::string16& text) OVERRIDE; - virtual void InsertChar(base::char16 ch, int flags) OVERRIDE; - virtual gfx::NativeWindow GetAttachedWindow() const OVERRIDE; - virtual TextInputType GetTextInputType() const OVERRIDE; - virtual TextInputMode GetTextInputMode() const OVERRIDE; - virtual bool CanComposeInline() const OVERRIDE; - virtual gfx::Rect GetCaretBounds() const OVERRIDE; + virtual void SetCompositionText(const CompositionText& composition) override; + virtual void ConfirmCompositionText() override; + virtual void ClearCompositionText() override; + virtual void InsertText(const base::string16& text) override; + virtual void InsertChar(base::char16 ch, int flags) override; + virtual gfx::NativeWindow GetAttachedWindow() const override; + virtual TextInputType GetTextInputType() const override; + virtual TextInputMode GetTextInputMode() const override; + virtual bool CanComposeInline() const override; + virtual gfx::Rect GetCaretBounds() const override; virtual bool GetCompositionCharacterBounds(uint32 index, - gfx::Rect* rect) const OVERRIDE; - virtual bool HasCompositionText() const OVERRIDE; - virtual bool GetTextRange(gfx::Range* range) const OVERRIDE; - virtual bool GetCompositionTextRange(gfx::Range* range) const OVERRIDE; - virtual bool GetSelectionRange(gfx::Range* range) const OVERRIDE; - virtual bool SetSelectionRange(const gfx::Range& range) OVERRIDE; - virtual bool DeleteRange(const gfx::Range& range) OVERRIDE; + gfx::Rect* rect) const override; + virtual bool HasCompositionText() const override; + virtual bool GetTextRange(gfx::Range* range) const override; + virtual bool GetCompositionTextRange(gfx::Range* range) const override; + virtual bool GetSelectionRange(gfx::Range* range) const override; + virtual bool SetSelectionRange(const gfx::Range& range) override; + virtual bool DeleteRange(const gfx::Range& range) override; virtual bool GetTextFromRange(const gfx::Range& range, - base::string16* text) const OVERRIDE; - virtual void OnInputMethodChanged() OVERRIDE; + base::string16* text) const override; + virtual void OnInputMethodChanged() override; virtual bool ChangeTextDirectionAndLayoutAlignment( - base::i18n::TextDirection direction) OVERRIDE; - virtual void ExtendSelectionAndDelete(size_t before, size_t after) OVERRIDE; - virtual void EnsureCaretInRect(const gfx::Rect& rect) OVERRIDE; - virtual void OnCandidateWindowShown() OVERRIDE; - virtual void OnCandidateWindowUpdated() OVERRIDE; - virtual void OnCandidateWindowHidden() OVERRIDE; - virtual bool IsEditingCommandEnabled(int command_id) OVERRIDE; - virtual void ExecuteEditingCommand(int command_id) OVERRIDE; + base::i18n::TextDirection direction) override; + virtual void ExtendSelectionAndDelete(size_t before, size_t after) override; + virtual void EnsureCaretInRect(const gfx::Rect& rect) override; + virtual void OnCandidateWindowShown() override; + virtual void OnCandidateWindowUpdated() override; + virtual void OnCandidateWindowHidden() override; + virtual bool IsEditingCommandEnabled(int command_id) override; + virtual void ExecuteEditingCommand(int command_id) override; TextInputType text_input_type_; diff --git a/ui/base/ime/input_method_auralinux.h b/ui/base/ime/input_method_auralinux.h index 245055e..505abbd 100644 --- a/ui/base/ime/input_method_auralinux.h +++ b/ui/base/ime/input_method_auralinux.h @@ -22,29 +22,29 @@ class UI_BASE_EXPORT InputMethodAuraLinux virtual ~InputMethodAuraLinux(); // Overriden from InputMethod. - virtual void Init(bool focused) OVERRIDE; + virtual void Init(bool focused) override; virtual bool OnUntranslatedIMEMessage(const base::NativeEvent& event, - NativeEventResult* result) OVERRIDE; - virtual bool DispatchKeyEvent(const ui::KeyEvent& event) OVERRIDE; - virtual void OnTextInputTypeChanged(const TextInputClient* client) OVERRIDE; - virtual void OnCaretBoundsChanged(const TextInputClient* client) OVERRIDE; - virtual void CancelComposition(const TextInputClient* client) OVERRIDE; - virtual void OnInputLocaleChanged() OVERRIDE; - virtual std::string GetInputLocale() OVERRIDE; - virtual bool IsActive() OVERRIDE; - virtual bool IsCandidatePopupOpen() const OVERRIDE; + NativeEventResult* result) override; + virtual bool DispatchKeyEvent(const ui::KeyEvent& event) override; + virtual void OnTextInputTypeChanged(const TextInputClient* client) override; + virtual void OnCaretBoundsChanged(const TextInputClient* client) override; + virtual void CancelComposition(const TextInputClient* client) override; + virtual void OnInputLocaleChanged() override; + virtual std::string GetInputLocale() override; + virtual bool IsActive() override; + virtual bool IsCandidatePopupOpen() const override; // Overriden from ui::LinuxInputMethodContextDelegate - virtual void OnCommit(const base::string16& text) OVERRIDE; + virtual void OnCommit(const base::string16& text) override; virtual void OnPreeditChanged(const CompositionText& composition_text) - OVERRIDE; - virtual void OnPreeditEnd() OVERRIDE; - virtual void OnPreeditStart() OVERRIDE; + override; + virtual void OnPreeditEnd() override; + virtual void OnPreeditStart() override; protected: // Overridden from InputMethodBase. virtual void OnDidChangeFocusedClient(TextInputClient* focused_before, - TextInputClient* focused) OVERRIDE; + TextInputClient* focused) override; private: // Allows to fire a VKEY_PROCESSKEY key event. diff --git a/ui/base/ime/input_method_base.h b/ui/base/ime/input_method_base.h index ce38015..76260e6 100644 --- a/ui/base/ime/input_method_base.h +++ b/ui/base/ime/input_method_base.h @@ -32,28 +32,28 @@ class UI_BASE_EXPORT InputMethodBase virtual ~InputMethodBase(); // Overriden from InputMethod. - virtual void SetDelegate(internal::InputMethodDelegate* delegate) OVERRIDE; - virtual void Init(bool focused) OVERRIDE; + virtual void SetDelegate(internal::InputMethodDelegate* delegate) override; + virtual void Init(bool focused) override; // If a derived class overrides OnFocus()/OnBlur(), it should call parent's // implementation first, to make sure |system_toplevel_window_focused_| flag // can be updated correctly. - virtual void OnFocus() OVERRIDE; - virtual void OnBlur() OVERRIDE; - virtual void SetFocusedTextInputClient(TextInputClient* client) OVERRIDE; - virtual void DetachTextInputClient(TextInputClient* client) OVERRIDE; - virtual TextInputClient* GetTextInputClient() const OVERRIDE; + virtual void OnFocus() override; + virtual void OnBlur() override; + virtual void SetFocusedTextInputClient(TextInputClient* client) override; + virtual void DetachTextInputClient(TextInputClient* client) override; + virtual TextInputClient* GetTextInputClient() const override; // If a derived class overrides this method, it should call parent's // implementation. - virtual void OnTextInputTypeChanged(const TextInputClient* client) OVERRIDE; + virtual void OnTextInputTypeChanged(const TextInputClient* client) override; - virtual TextInputType GetTextInputType() const OVERRIDE; - virtual TextInputMode GetTextInputMode() const OVERRIDE; - virtual bool CanComposeInline() const OVERRIDE; - virtual void ShowImeIfNeeded() OVERRIDE; + virtual TextInputType GetTextInputType() const override; + virtual TextInputMode GetTextInputMode() const override; + virtual bool CanComposeInline() const override; + virtual void ShowImeIfNeeded() override; - virtual void AddObserver(InputMethodObserver* observer) OVERRIDE; - virtual void RemoveObserver(InputMethodObserver* observer) OVERRIDE; + virtual void AddObserver(InputMethodObserver* observer) override; + virtual void RemoveObserver(InputMethodObserver* observer) override; protected: virtual void OnWillChangeFocusedClient(TextInputClient* focused_before, diff --git a/ui/base/ime/input_method_base_unittest.cc b/ui/base/ime/input_method_base_unittest.cc index 830bba0..797d88e 100644 --- a/ui/base/ime/input_method_base_unittest.cc +++ b/ui/base/ime/input_method_base_unittest.cc @@ -154,35 +154,35 @@ class MockInputMethodBase : public InputMethodBase { // Overriden from InputMethod. virtual bool OnUntranslatedIMEMessage( const base::NativeEvent& event, - InputMethod::NativeEventResult* result) OVERRIDE { + InputMethod::NativeEventResult* result) override { return false; } - virtual bool DispatchKeyEvent(const ui::KeyEvent&) OVERRIDE { + virtual bool DispatchKeyEvent(const ui::KeyEvent&) override { return false; } - virtual void OnCaretBoundsChanged(const TextInputClient* client) OVERRIDE { + virtual void OnCaretBoundsChanged(const TextInputClient* client) override { } - virtual void CancelComposition(const TextInputClient* client) OVERRIDE { + virtual void CancelComposition(const TextInputClient* client) override { } - virtual void OnInputLocaleChanged() OVERRIDE { + virtual void OnInputLocaleChanged() override { } - virtual std::string GetInputLocale() OVERRIDE{ + virtual std::string GetInputLocale() override{ return ""; } - virtual bool IsActive() OVERRIDE { + virtual bool IsActive() override { return false; } - virtual bool IsCandidatePopupOpen() const OVERRIDE { + virtual bool IsCandidatePopupOpen() const override { return false; } // Overriden from InputMethodBase. virtual void OnWillChangeFocusedClient(TextInputClient* focused_before, - TextInputClient* focused) OVERRIDE { + TextInputClient* focused) override { verifier_->OnWillChangeFocusedClient(focused_before, focused); } virtual void OnDidChangeFocusedClient(TextInputClient* focused_before, - TextInputClient* focused) OVERRIDE { + TextInputClient* focused) override { verifier_->OnDidChangeFocusedClient(focused_before, focused); } @@ -202,20 +202,20 @@ class MockInputMethodObserver : public InputMethodObserver { } private: - virtual void OnTextInputTypeChanged(const TextInputClient* client) OVERRIDE { + virtual void OnTextInputTypeChanged(const TextInputClient* client) override { } - virtual void OnFocus() OVERRIDE { + virtual void OnFocus() override { } - virtual void OnBlur() OVERRIDE { + virtual void OnBlur() override { } - virtual void OnCaretBoundsChanged(const TextInputClient* client) OVERRIDE { + virtual void OnCaretBoundsChanged(const TextInputClient* client) override { } - virtual void OnTextInputStateChanged(const TextInputClient* client) OVERRIDE { + virtual void OnTextInputStateChanged(const TextInputClient* client) override { verifier_->OnTextInputStateChanged(client); } - virtual void OnShowImeIfNeeded() OVERRIDE { + virtual void OnShowImeIfNeeded() override { } - virtual void OnInputMethodDestroyed(const InputMethod* client) OVERRIDE { + virtual void OnInputMethodDestroyed(const InputMethod* client) override { } ClientChangeVerifier* verifier_; @@ -230,13 +230,13 @@ class MockTextInputClient : public DummyTextInputClient { virtual ~MockTextInputClient() { } - virtual void OnCandidateWindowShown() OVERRIDE { + virtual void OnCandidateWindowShown() override { ++shown_event_count_; } - virtual void OnCandidateWindowUpdated() OVERRIDE { + virtual void OnCandidateWindowUpdated() override { ++updated_event_count_; } - virtual void OnCandidateWindowHidden() OVERRIDE { + virtual void OnCandidateWindowHidden() override { ++hidden_event_count_; } diff --git a/ui/base/ime/input_method_chromeos.h b/ui/base/ime/input_method_chromeos.h index 98b42ae..a09cd3d 100644 --- a/ui/base/ime/input_method_chromeos.h +++ b/ui/base/ime/input_method_chromeos.h @@ -28,18 +28,18 @@ class UI_BASE_EXPORT InputMethodChromeOS virtual ~InputMethodChromeOS(); // Overridden from InputMethod: - virtual void OnFocus() OVERRIDE; - virtual void OnBlur() OVERRIDE; + virtual void OnFocus() override; + virtual void OnBlur() override; virtual bool OnUntranslatedIMEMessage(const base::NativeEvent& event, - NativeEventResult* result) OVERRIDE; - virtual bool DispatchKeyEvent(const ui::KeyEvent& event) OVERRIDE; - virtual void OnTextInputTypeChanged(const TextInputClient* client) OVERRIDE; - virtual void OnCaretBoundsChanged(const TextInputClient* client) OVERRIDE; - virtual void CancelComposition(const TextInputClient* client) OVERRIDE; - virtual void OnInputLocaleChanged() OVERRIDE; - virtual std::string GetInputLocale() OVERRIDE; - virtual bool IsActive() OVERRIDE; - virtual bool IsCandidatePopupOpen() const OVERRIDE; + NativeEventResult* result) override; + virtual bool DispatchKeyEvent(const ui::KeyEvent& event) override; + virtual void OnTextInputTypeChanged(const TextInputClient* client) override; + virtual void OnCaretBoundsChanged(const TextInputClient* client) override; + virtual void CancelComposition(const TextInputClient* client) override; + virtual void OnInputLocaleChanged() override; + virtual std::string GetInputLocale() override; + virtual bool IsActive() override; + virtual bool IsCandidatePopupOpen() const override; protected: // Converts |text| into CompositionText. @@ -59,9 +59,9 @@ class UI_BASE_EXPORT InputMethodChromeOS // Overridden from InputMethodBase: virtual void OnWillChangeFocusedClient(TextInputClient* focused_before, - TextInputClient* focused) OVERRIDE; + TextInputClient* focused) override; virtual void OnDidChangeFocusedClient(TextInputClient* focused_before, - TextInputClient* focused) OVERRIDE; + TextInputClient* focused) override; // Asks the client to confirm current composition text. void ConfirmCompositionText(); @@ -100,11 +100,11 @@ class UI_BASE_EXPORT InputMethodChromeOS bool ExecuteCharacterComposer(const ui::KeyEvent& event); // chromeos::IMEInputContextHandlerInterface overrides: - virtual void CommitText(const std::string& text) OVERRIDE; + virtual void CommitText(const std::string& text) override; virtual void UpdateCompositionText(const chromeos::CompositionText& text, uint32 cursor_pos, - bool visible) OVERRIDE; - virtual void DeleteSurroundingText(int32 offset, uint32 length) OVERRIDE; + bool visible) override; + virtual void DeleteSurroundingText(int32 offset, uint32 length) override; // Hides the composition text. void HidePreeditText(); diff --git a/ui/base/ime/input_method_chromeos_unittest.cc b/ui/base/ime/input_method_chromeos_unittest.cc index 1db29e9..5071872 100644 --- a/ui/base/ime/input_method_chromeos_unittest.cc +++ b/ui/base/ime/input_method_chromeos_unittest.cc @@ -80,7 +80,7 @@ class TestableInputMethodChromeOS : public InputMethodChromeOS { // Overridden from InputMethodChromeOS: virtual void ProcessKeyEventPostIME(const ui::KeyEvent& key_event, - bool handled) OVERRIDE { + bool handled) override { process_key_event_post_ime_args_.event = &key_event; process_key_event_post_ime_args_.handled = handled; ++process_key_event_post_ime_call_count_; @@ -210,7 +210,7 @@ class InputMethodChromeOSTest : public internal::InputMethodDelegate, virtual ~InputMethodChromeOSTest() { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { chromeos::IMEBridge::Initialize(); mock_ime_engine_handler_.reset( @@ -230,7 +230,7 @@ class InputMethodChromeOSTest : public internal::InputMethodDelegate, ime_->SetFocusedTextInputClient(this); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { if (ime_.get()) { if (switches::IsTextInputFocusManagerEnabled()) TextInputFocusManager::GetInstance()->BlurTextInputClient(this); @@ -246,89 +246,89 @@ class InputMethodChromeOSTest : public internal::InputMethodDelegate, } // Overridden from ui::internal::InputMethodDelegate: - virtual bool DispatchKeyEventPostIME(const ui::KeyEvent& event) OVERRIDE { + virtual bool DispatchKeyEventPostIME(const ui::KeyEvent& event) override { dispatched_key_event_ = event; return false; } // Overridden from ui::TextInputClient: virtual void SetCompositionText( - const CompositionText& composition) OVERRIDE { + const CompositionText& composition) override { composition_text_ = composition; } - virtual void ConfirmCompositionText() OVERRIDE { + virtual void ConfirmCompositionText() override { confirmed_text_ = composition_text_; composition_text_.Clear(); } - virtual void ClearCompositionText() OVERRIDE { + virtual void ClearCompositionText() override { composition_text_.Clear(); } - virtual void InsertText(const base::string16& text) OVERRIDE { + virtual void InsertText(const base::string16& text) override { inserted_text_ = text; } - virtual void InsertChar(base::char16 ch, int flags) OVERRIDE { + virtual void InsertChar(base::char16 ch, int flags) override { inserted_char_ = ch; inserted_char_flags_ = flags; } - virtual gfx::NativeWindow GetAttachedWindow() const OVERRIDE { + virtual gfx::NativeWindow GetAttachedWindow() const override { return static_cast<gfx::NativeWindow>(NULL); } - virtual TextInputType GetTextInputType() const OVERRIDE { + virtual TextInputType GetTextInputType() const override { return input_type_; } - virtual TextInputMode GetTextInputMode() const OVERRIDE { + virtual TextInputMode GetTextInputMode() const override { return input_mode_; } - virtual bool CanComposeInline() const OVERRIDE { + virtual bool CanComposeInline() const override { return can_compose_inline_; } - virtual gfx::Rect GetCaretBounds() const OVERRIDE { + virtual gfx::Rect GetCaretBounds() const override { return caret_bounds_; } virtual bool GetCompositionCharacterBounds(uint32 index, - gfx::Rect* rect) const OVERRIDE { + gfx::Rect* rect) const override { return false; } - virtual bool HasCompositionText() const OVERRIDE { + virtual bool HasCompositionText() const override { CompositionText empty; return composition_text_ != empty; } - virtual bool GetTextRange(gfx::Range* range) const OVERRIDE { + virtual bool GetTextRange(gfx::Range* range) const override { *range = text_range_; return true; } - virtual bool GetCompositionTextRange(gfx::Range* range) const OVERRIDE { + virtual bool GetCompositionTextRange(gfx::Range* range) const override { return false; } - virtual bool GetSelectionRange(gfx::Range* range) const OVERRIDE { + virtual bool GetSelectionRange(gfx::Range* range) const override { *range = selection_range_; return true; } - virtual bool SetSelectionRange(const gfx::Range& range) OVERRIDE { + virtual bool SetSelectionRange(const gfx::Range& range) override { return false; } - virtual bool DeleteRange(const gfx::Range& range) OVERRIDE { return false; } + virtual bool DeleteRange(const gfx::Range& range) override { return false; } virtual bool GetTextFromRange(const gfx::Range& range, - base::string16* text) const OVERRIDE { + base::string16* text) const override { *text = surrounding_text_.substr(range.GetMin(), range.length()); return true; } - virtual void OnInputMethodChanged() OVERRIDE { + virtual void OnInputMethodChanged() override { ++on_input_method_changed_call_count_; } virtual bool ChangeTextDirectionAndLayoutAlignment( - base::i18n::TextDirection direction) OVERRIDE { return false; } + base::i18n::TextDirection direction) override { return false; } virtual void ExtendSelectionAndDelete(size_t before, - size_t after) OVERRIDE {} - virtual void EnsureCaretInRect(const gfx::Rect& rect) OVERRIDE {} - virtual void OnCandidateWindowShown() OVERRIDE {} - virtual void OnCandidateWindowUpdated() OVERRIDE {} - virtual void OnCandidateWindowHidden() OVERRIDE {} - virtual bool IsEditingCommandEnabled(int command_id) OVERRIDE { + size_t after) override {} + virtual void EnsureCaretInRect(const gfx::Rect& rect) override {} + virtual void OnCandidateWindowShown() override {} + virtual void OnCandidateWindowUpdated() override {} + virtual void OnCandidateWindowHidden() override {} + virtual bool IsEditingCommandEnabled(int command_id) override { return false; } - virtual void ExecuteEditingCommand(int command_id) OVERRIDE {} + virtual void ExecuteEditingCommand(int command_id) override {} bool HasNativeEvent() const { return dispatched_key_event_.HasNativeEvent(); @@ -945,7 +945,7 @@ class InputMethodChromeOSKeyEventTest : public InputMethodChromeOSTest { InputMethodChromeOSKeyEventTest() {} virtual ~InputMethodChromeOSKeyEventTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { InputMethodChromeOSTest::SetUp(); ime_->Init(true); } diff --git a/ui/base/ime/input_method_mac.h b/ui/base/ime/input_method_mac.h index 08f6080..95d3cee 100644 --- a/ui/base/ime/input_method_mac.h +++ b/ui/base/ime/input_method_mac.h @@ -20,14 +20,14 @@ class UI_BASE_EXPORT InputMethodMac : public InputMethodBase { // Overriden from InputMethod. virtual bool OnUntranslatedIMEMessage(const base::NativeEvent& event, - NativeEventResult* result) OVERRIDE; - virtual bool DispatchKeyEvent(const ui::KeyEvent& event) OVERRIDE; - virtual void OnCaretBoundsChanged(const TextInputClient* client) OVERRIDE; - virtual void CancelComposition(const TextInputClient* client) OVERRIDE; - virtual void OnInputLocaleChanged() OVERRIDE; - virtual std::string GetInputLocale() OVERRIDE; - virtual bool IsActive() OVERRIDE; - virtual bool IsCandidatePopupOpen() const OVERRIDE; + NativeEventResult* result) override; + virtual bool DispatchKeyEvent(const ui::KeyEvent& event) override; + virtual void OnCaretBoundsChanged(const TextInputClient* client) override; + virtual void CancelComposition(const TextInputClient* client) override; + virtual void OnInputLocaleChanged() override; + virtual std::string GetInputLocale() override; + virtual bool IsActive() override; + virtual bool IsCandidatePopupOpen() const override; private: DISALLOW_COPY_AND_ASSIGN(InputMethodMac); diff --git a/ui/base/ime/input_method_minimal.h b/ui/base/ime/input_method_minimal.h index 84fd066..14700f5 100644 --- a/ui/base/ime/input_method_minimal.h +++ b/ui/base/ime/input_method_minimal.h @@ -18,14 +18,14 @@ class UI_BASE_EXPORT InputMethodMinimal : public InputMethodBase { // Overriden from InputMethod. virtual bool OnUntranslatedIMEMessage(const base::NativeEvent& event, - NativeEventResult* result) OVERRIDE; - virtual bool DispatchKeyEvent(const ui::KeyEvent& event) OVERRIDE; - virtual void OnCaretBoundsChanged(const TextInputClient* client) OVERRIDE; - virtual void CancelComposition(const TextInputClient* client) OVERRIDE; - virtual void OnInputLocaleChanged() OVERRIDE; - virtual std::string GetInputLocale() OVERRIDE; - virtual bool IsActive() OVERRIDE; - virtual bool IsCandidatePopupOpen() const OVERRIDE; + NativeEventResult* result) override; + virtual bool DispatchKeyEvent(const ui::KeyEvent& event) override; + virtual void OnCaretBoundsChanged(const TextInputClient* client) override; + virtual void CancelComposition(const TextInputClient* client) override; + virtual void OnInputLocaleChanged() override; + virtual std::string GetInputLocale() override; + virtual bool IsActive() override; + virtual bool IsCandidatePopupOpen() const override; private: DISALLOW_COPY_AND_ASSIGN(InputMethodMinimal); diff --git a/ui/base/ime/input_method_win.h b/ui/base/ime/input_method_win.h index b02d670..b6d5320 100644 --- a/ui/base/ime/input_method_win.h +++ b/ui/base/ime/input_method_win.h @@ -23,28 +23,28 @@ class UI_BASE_EXPORT InputMethodWin : public InputMethodBase { HWND toplevel_window_handle); // Overridden from InputMethod: - virtual void Init(bool focused) OVERRIDE; - virtual void OnFocus() OVERRIDE; - virtual void OnBlur() OVERRIDE; + virtual void Init(bool focused) override; + virtual void OnFocus() override; + virtual void OnBlur() override; virtual bool OnUntranslatedIMEMessage(const base::NativeEvent& event, - NativeEventResult* result) OVERRIDE; - virtual bool DispatchKeyEvent(const ui::KeyEvent& event) OVERRIDE; - virtual void OnTextInputTypeChanged(const TextInputClient* client) OVERRIDE; - virtual void OnCaretBoundsChanged(const TextInputClient* client) OVERRIDE; - virtual void CancelComposition(const TextInputClient* client) OVERRIDE; - virtual void OnInputLocaleChanged() OVERRIDE; - virtual std::string GetInputLocale() OVERRIDE; - virtual bool IsActive() OVERRIDE; - virtual bool IsCandidatePopupOpen() const OVERRIDE; + NativeEventResult* result) override; + virtual bool DispatchKeyEvent(const ui::KeyEvent& event) override; + virtual void OnTextInputTypeChanged(const TextInputClient* client) override; + virtual void OnCaretBoundsChanged(const TextInputClient* client) override; + virtual void CancelComposition(const TextInputClient* client) override; + virtual void OnInputLocaleChanged() override; + virtual std::string GetInputLocale() override; + virtual bool IsActive() override; + virtual bool IsCandidatePopupOpen() const override; protected: // Overridden from InputMethodBase: // If a derived class overrides this method, it should call parent's // implementation. virtual void OnWillChangeFocusedClient(TextInputClient* focused_before, - TextInputClient* focused) OVERRIDE; + TextInputClient* focused) override; virtual void OnDidChangeFocusedClient(TextInputClient* focused_before, - TextInputClient* focused) OVERRIDE; + TextInputClient* focused) override; private: // For both WM_CHAR and WM_SYSCHAR diff --git a/ui/base/ime/linux/fake_input_method_context.h b/ui/base/ime/linux/fake_input_method_context.h index 67210c1..d13d2b9 100644 --- a/ui/base/ime/linux/fake_input_method_context.h +++ b/ui/base/ime/linux/fake_input_method_context.h @@ -15,11 +15,11 @@ class FakeInputMethodContext : public LinuxInputMethodContext { FakeInputMethodContext(); // Overriden from ui::LinuxInputMethodContext - virtual bool DispatchKeyEvent(const ui::KeyEvent& key_event) OVERRIDE; - virtual void Reset() OVERRIDE; + virtual bool DispatchKeyEvent(const ui::KeyEvent& key_event) override; + virtual void Reset() override; virtual void OnTextInputTypeChanged(ui::TextInputType text_input_type) - OVERRIDE; - virtual void OnCaretBoundsChanged(const gfx::Rect& caret_bounds) OVERRIDE; + override; + virtual void OnCaretBoundsChanged(const gfx::Rect& caret_bounds) override; private: DISALLOW_COPY_AND_ASSIGN(FakeInputMethodContext); diff --git a/ui/base/ime/linux/fake_input_method_context_factory.h b/ui/base/ime/linux/fake_input_method_context_factory.h index b2f6b43..d6101fa 100644 --- a/ui/base/ime/linux/fake_input_method_context_factory.h +++ b/ui/base/ime/linux/fake_input_method_context_factory.h @@ -17,7 +17,7 @@ class FakeInputMethodContextFactory : public LinuxInputMethodContextFactory { // Overriden from ui::LinuxInputMethodContextFactory virtual scoped_ptr<LinuxInputMethodContext> CreateInputMethodContext( - LinuxInputMethodContextDelegate* delegate) const OVERRIDE; + LinuxInputMethodContextDelegate* delegate) const override; private: DISALLOW_COPY_AND_ASSIGN(FakeInputMethodContextFactory); diff --git a/ui/base/ime/mock_input_method.h b/ui/base/ime/mock_input_method.h index 7716065..e61c6fb 100644 --- a/ui/base/ime/mock_input_method.h +++ b/ui/base/ime/mock_input_method.h @@ -29,29 +29,29 @@ class UI_BASE_EXPORT MockInputMethod : NON_EXPORTED_BASE(public InputMethod) { virtual ~MockInputMethod(); // Overriden from InputMethod. - virtual void SetDelegate(internal::InputMethodDelegate* delegate) OVERRIDE; - virtual void Init(bool focused) OVERRIDE; - virtual void OnFocus() OVERRIDE; - virtual void OnBlur() OVERRIDE; + virtual void SetDelegate(internal::InputMethodDelegate* delegate) override; + virtual void Init(bool focused) override; + virtual void OnFocus() override; + virtual void OnBlur() override; virtual bool OnUntranslatedIMEMessage(const base::NativeEvent& event, - NativeEventResult* result) OVERRIDE; - virtual void SetFocusedTextInputClient(TextInputClient* client) OVERRIDE; - virtual void DetachTextInputClient(TextInputClient* client) OVERRIDE; - virtual TextInputClient* GetTextInputClient() const OVERRIDE; - virtual bool DispatchKeyEvent(const ui::KeyEvent& event) OVERRIDE; - virtual void OnTextInputTypeChanged(const TextInputClient* client) OVERRIDE; - virtual void OnCaretBoundsChanged(const TextInputClient* client) OVERRIDE; - virtual void CancelComposition(const TextInputClient* client) OVERRIDE; - virtual void OnInputLocaleChanged() OVERRIDE; - virtual std::string GetInputLocale() OVERRIDE; - virtual bool IsActive() OVERRIDE; - virtual TextInputType GetTextInputType() const OVERRIDE; - virtual TextInputMode GetTextInputMode() const OVERRIDE; - virtual bool CanComposeInline() const OVERRIDE; - virtual bool IsCandidatePopupOpen() const OVERRIDE; - virtual void ShowImeIfNeeded() OVERRIDE; - virtual void AddObserver(InputMethodObserver* observer) OVERRIDE; - virtual void RemoveObserver(InputMethodObserver* observer) OVERRIDE; + NativeEventResult* result) override; + virtual void SetFocusedTextInputClient(TextInputClient* client) override; + virtual void DetachTextInputClient(TextInputClient* client) override; + virtual TextInputClient* GetTextInputClient() const override; + virtual bool DispatchKeyEvent(const ui::KeyEvent& event) override; + virtual void OnTextInputTypeChanged(const TextInputClient* client) override; + virtual void OnCaretBoundsChanged(const TextInputClient* client) override; + virtual void CancelComposition(const TextInputClient* client) override; + virtual void OnInputLocaleChanged() override; + virtual std::string GetInputLocale() override; + virtual bool IsActive() override; + virtual TextInputType GetTextInputType() const override; + virtual TextInputMode GetTextInputMode() const override; + virtual bool CanComposeInline() const override; + virtual bool IsCandidatePopupOpen() const override; + virtual void ShowImeIfNeeded() override; + virtual void AddObserver(InputMethodObserver* observer) override; + virtual void RemoveObserver(InputMethodObserver* observer) override; private: TextInputClient* text_input_client_; diff --git a/ui/base/ime/remote_input_method_win.cc b/ui/base/ime/remote_input_method_win.cc index 9fad0ad..b01a39c 100644 --- a/ui/base/ime/remote_input_method_win.cc +++ b/ui/base/ime/remote_input_method_win.cc @@ -128,25 +128,25 @@ class RemoteInputMethodWin : public InputMethod, private: // Overridden from InputMethod: - virtual void SetDelegate(internal::InputMethodDelegate* delegate) OVERRIDE { + virtual void SetDelegate(internal::InputMethodDelegate* delegate) override { delegate_ = delegate; } - virtual void Init(bool focused) OVERRIDE { + virtual void Init(bool focused) override { } - virtual void OnFocus() OVERRIDE { + virtual void OnFocus() override { } - virtual void OnBlur() OVERRIDE { + virtual void OnBlur() override { } virtual bool OnUntranslatedIMEMessage(const base::NativeEvent& event, - NativeEventResult* result) OVERRIDE { + NativeEventResult* result) override { return false; } - virtual void SetFocusedTextInputClient(TextInputClient* client) OVERRIDE { + virtual void SetFocusedTextInputClient(TextInputClient* client) override { std::vector<int32> prev_input_scopes; std::swap(input_scopes_, prev_input_scopes); std::vector<gfx::Rect> prev_bounds; @@ -172,17 +172,17 @@ class RemoteInputMethodWin : public InputMethod, composition_character_bounds_); } - virtual void DetachTextInputClient(TextInputClient* client) OVERRIDE { + virtual void DetachTextInputClient(TextInputClient* client) override { if (text_input_client_ != client) return; SetFocusedTextInputClient(NULL); } - virtual TextInputClient* GetTextInputClient() const OVERRIDE { + virtual TextInputClient* GetTextInputClient() const override { return text_input_client_; } - virtual bool DispatchKeyEvent(const ui::KeyEvent& event) OVERRIDE { + virtual bool DispatchKeyEvent(const ui::KeyEvent& event) override { if (event.HasNativeEvent()) { const base::NativeEvent& native_key_event = event.native_event(); if (native_key_event.message != WM_CHAR) @@ -207,7 +207,7 @@ class RemoteInputMethodWin : public InputMethod, return delegate_->DispatchKeyEventPostIME(event); } - virtual void OnTextInputTypeChanged(const TextInputClient* client) OVERRIDE { + virtual void OnTextInputTypeChanged(const TextInputClient* client) override { if (!text_input_client_ || text_input_client_ != client) return; std::vector<int32> prev_input_scopes; @@ -220,7 +220,7 @@ class RemoteInputMethodWin : public InputMethod, } } - virtual void OnCaretBoundsChanged(const TextInputClient* client) OVERRIDE { + virtual void OnCaretBoundsChanged(const TextInputClient* client) override { if (!text_input_client_ || text_input_client_ != client) return; std::vector<gfx::Rect> prev_rects; @@ -232,15 +232,15 @@ class RemoteInputMethodWin : public InputMethod, } } - virtual void CancelComposition(const TextInputClient* client) OVERRIDE { + virtual void CancelComposition(const TextInputClient* client) override { if (CanSendRemoteNotification(client)) remote_delegate_->CancelComposition(); } - virtual void OnInputLocaleChanged() OVERRIDE { + virtual void OnInputLocaleChanged() override { } - virtual std::string GetInputLocale() OVERRIDE { + virtual std::string GetInputLocale() override { const LCID locale_id = MAKELCID(langid_, SORT_DEFAULT); std::string language = GetLocaleString(locale_id, LOCALE_SISO639LANGNAME); @@ -253,42 +253,42 @@ class RemoteInputMethodWin : public InputMethod, return language.append(1, '-').append(region); } - virtual bool IsActive() OVERRIDE { + virtual bool IsActive() override { return true; // always turned on } - virtual TextInputType GetTextInputType() const OVERRIDE { + virtual TextInputType GetTextInputType() const override { return text_input_client_ ? text_input_client_->GetTextInputType() : TEXT_INPUT_TYPE_NONE; } - virtual TextInputMode GetTextInputMode() const OVERRIDE { + virtual TextInputMode GetTextInputMode() const override { return text_input_client_ ? text_input_client_->GetTextInputMode() : TEXT_INPUT_MODE_DEFAULT; } - virtual bool CanComposeInline() const OVERRIDE { + virtual bool CanComposeInline() const override { return text_input_client_ ? text_input_client_->CanComposeInline() : true; } - virtual bool IsCandidatePopupOpen() const OVERRIDE { + virtual bool IsCandidatePopupOpen() const override { return is_candidate_popup_open_; } - virtual void ShowImeIfNeeded() OVERRIDE { + virtual void ShowImeIfNeeded() override { } - virtual void AddObserver(InputMethodObserver* observer) OVERRIDE { + virtual void AddObserver(InputMethodObserver* observer) override { observer_list_.AddObserver(observer); } - virtual void RemoveObserver(InputMethodObserver* observer) OVERRIDE { + virtual void RemoveObserver(InputMethodObserver* observer) override { observer_list_.RemoveObserver(observer); } // Overridden from RemoteInputMethodPrivateWin: virtual void SetRemoteDelegate( - internal::RemoteInputMethodDelegateWin* delegate) OVERRIDE{ + internal::RemoteInputMethodDelegateWin* delegate) override{ remote_delegate_ = delegate; // Sync initial state. @@ -298,7 +298,7 @@ class RemoteInputMethodWin : public InputMethod, } } - virtual void OnCandidatePopupChanged(bool visible) OVERRIDE { + virtual void OnCandidatePopupChanged(bool visible) override { is_candidate_popup_open_ = visible; if (!text_input_client_) return; @@ -310,7 +310,7 @@ class RemoteInputMethodWin : public InputMethod, text_input_client_->OnCandidateWindowHidden(); } - virtual void OnInputSourceChanged(LANGID langid, bool /*is_ime*/) OVERRIDE { + virtual void OnInputSourceChanged(LANGID langid, bool /*is_ime*/) override { // Note: Currently |is_ime| is not utilized yet. const bool changed = (langid_ != langid); langid_ = langid; @@ -319,13 +319,13 @@ class RemoteInputMethodWin : public InputMethod, } virtual void OnCompositionChanged( - const CompositionText& composition_text) OVERRIDE { + const CompositionText& composition_text) override { if (!text_input_client_) return; text_input_client_->SetCompositionText(composition_text); } - virtual void OnTextCommitted(const base::string16& text) OVERRIDE { + virtual void OnTextCommitted(const base::string16& text) override { if (!text_input_client_) return; if (text_input_client_->GetTextInputType() == TEXT_INPUT_TYPE_NONE) { diff --git a/ui/base/ime/remote_input_method_win_unittest.cc b/ui/base/ime/remote_input_method_win_unittest.cc index 40269de..5cf8aa3 100644 --- a/ui/base/ime/remote_input_method_win_unittest.cc +++ b/ui/base/ime/remote_input_method_win_unittest.cc @@ -87,28 +87,28 @@ class MockTextInputClient : public DummyTextInputClient { private: // Overriden from DummyTextInputClient. virtual void SetCompositionText( - const ui::CompositionText& composition) OVERRIDE { + const ui::CompositionText& composition) override { ++call_count_set_composition_text_; } - virtual void InsertChar(base::char16 ch, int flags) OVERRIDE { + virtual void InsertChar(base::char16 ch, int flags) override { inserted_text_.append(1, ch); ++call_count_insert_char_; } - virtual void InsertText(const base::string16& text) OVERRIDE { + virtual void InsertText(const base::string16& text) override { inserted_text_.append(text); ++call_count_insert_text_; } - virtual ui::TextInputType GetTextInputType() const OVERRIDE { + virtual ui::TextInputType GetTextInputType() const override { return text_input_type_; } - virtual ui::TextInputMode GetTextInputMode() const OVERRIDE { + virtual ui::TextInputMode GetTextInputMode() const override { return text_input_mode_; } virtual gfx::Rect GetCaretBounds() const { return caret_bounds_; } virtual bool GetCompositionCharacterBounds(uint32 index, - gfx::Rect* rect) const OVERRIDE { + gfx::Rect* rect) const override { // Emulate the situation of crbug.com/328237. if (emulate_pepper_flash_) return false; @@ -117,19 +117,19 @@ class MockTextInputClient : public DummyTextInputClient { *rect = composition_character_bounds_[index]; return true; } - virtual bool HasCompositionText() const OVERRIDE { + virtual bool HasCompositionText() const override { return !composition_character_bounds_.empty(); } - virtual bool GetCompositionTextRange(gfx::Range* range) const OVERRIDE { + virtual bool GetCompositionTextRange(gfx::Range* range) const override { if (composition_character_bounds_.empty()) return false; *range = gfx::Range(0, composition_character_bounds_.size()); return true; } - virtual void OnCandidateWindowShown() OVERRIDE { + virtual void OnCandidateWindowShown() override { is_candidate_window_shown_called_ = true; } - virtual void OnCandidateWindowHidden() OVERRIDE { + virtual void OnCandidateWindowHidden() override { is_candidate_window_hidden_called_ = true; } @@ -159,7 +159,7 @@ class MockInputMethodDelegate : public internal::InputMethodDelegate { } private: - virtual bool DispatchKeyEventPostIME(const ui::KeyEvent& event) OVERRIDE { + virtual bool DispatchKeyEventPostIME(const ui::KeyEvent& event) override { EXPECT_FALSE(event.HasNativeEvent()); fabricated_key_events_.push_back(event.key_code()); return true; @@ -197,13 +197,13 @@ class MockRemoteInputMethodDelegateWin } private: - virtual void CancelComposition() OVERRIDE { + virtual void CancelComposition() override { cancel_composition_called_ = true; } virtual void OnTextInputClientUpdated( const std::vector<int32>& input_scopes, - const std::vector<gfx::Rect>& composition_character_bounds) OVERRIDE { + const std::vector<gfx::Rect>& composition_character_bounds) override { text_input_client_updated_called_ = true; input_scopes_ = input_scopes; composition_character_bounds_ = composition_character_bounds; @@ -237,18 +237,18 @@ class MockInputMethodObserver : public InputMethodObserver { private: // Overriden from InputMethodObserver. - virtual void OnTextInputTypeChanged(const TextInputClient* client) OVERRIDE { + virtual void OnTextInputTypeChanged(const TextInputClient* client) override { } - virtual void OnFocus() OVERRIDE { + virtual void OnFocus() override { } - virtual void OnBlur() OVERRIDE { + virtual void OnBlur() override { } - virtual void OnCaretBoundsChanged(const TextInputClient* client) OVERRIDE { + virtual void OnCaretBoundsChanged(const TextInputClient* client) override { } - virtual void OnTextInputStateChanged(const TextInputClient* client) OVERRIDE { + virtual void OnTextInputStateChanged(const TextInputClient* client) override { ++on_text_input_state_changed_; } - virtual void OnInputMethodDestroyed(const InputMethod* client) OVERRIDE { + virtual void OnInputMethodDestroyed(const InputMethod* client) override { ++on_input_method_destroyed_changed_; } virtual void OnShowImeIfNeeded() { diff --git a/ui/base/ime/win/tsf_input_scope.cc b/ui/base/ime/win/tsf_input_scope.cc index f40f928..1c248f1 100644 --- a/ui/base/ime/win/tsf_input_scope.cc +++ b/ui/base/ime/win/tsf_input_scope.cc @@ -29,18 +29,18 @@ void AppendNonTrivialInputScope(std::vector<InputScope>* input_scopes, input_scopes->push_back(input_scope); } -class TSFInputScope FINAL : public ITfInputScope { +class TSFInputScope final : public ITfInputScope { public: explicit TSFInputScope(const std::vector<InputScope>& input_scopes) : input_scopes_(input_scopes), ref_count_(0) {} // ITfInputScope: - STDMETHOD_(ULONG, AddRef)() OVERRIDE { + STDMETHOD_(ULONG, AddRef)() override { return InterlockedIncrement(&ref_count_); } - STDMETHOD_(ULONG, Release)() OVERRIDE { + STDMETHOD_(ULONG, Release)() override { const LONG count = InterlockedDecrement(&ref_count_); if (!count) { delete this; @@ -49,7 +49,7 @@ class TSFInputScope FINAL : public ITfInputScope { return static_cast<ULONG>(count); } - STDMETHOD(QueryInterface)(REFIID iid, void** result) OVERRIDE { + STDMETHOD(QueryInterface)(REFIID iid, void** result) override { if (!result) return E_INVALIDARG; if (iid == IID_IUnknown || iid == IID_ITfInputScope) { @@ -62,7 +62,7 @@ class TSFInputScope FINAL : public ITfInputScope { return S_OK; } - STDMETHOD(GetInputScopes)(InputScope** input_scopes, UINT* count) OVERRIDE { + STDMETHOD(GetInputScopes)(InputScope** input_scopes, UINT* count) override { if (!count || !input_scopes) return E_INVALIDARG; *input_scopes = static_cast<InputScope*>(CoTaskMemAlloc( @@ -78,19 +78,19 @@ class TSFInputScope FINAL : public ITfInputScope { return S_OK; } - STDMETHOD(GetPhrase)(BSTR** phrases, UINT* count) OVERRIDE { + STDMETHOD(GetPhrase)(BSTR** phrases, UINT* count) override { return E_NOTIMPL; } - STDMETHOD(GetRegularExpression)(BSTR* regexp) OVERRIDE { + STDMETHOD(GetRegularExpression)(BSTR* regexp) override { return E_NOTIMPL; } - STDMETHOD(GetSRGS)(BSTR* srgs) OVERRIDE { + STDMETHOD(GetSRGS)(BSTR* srgs) override { return E_NOTIMPL; } - STDMETHOD(GetXML)(BSTR* xml) OVERRIDE { + STDMETHOD(GetXML)(BSTR* xml) override { return E_NOTIMPL; } diff --git a/ui/base/models/list_model_unittest.cc b/ui/base/models/list_model_unittest.cc index 5666167..8422a12 100644 --- a/ui/base/models/list_model_unittest.cc +++ b/ui/base/models/list_model_unittest.cc @@ -47,16 +47,16 @@ class ListModelTest : public testing::Test, } // ListModelObserver implementation: - virtual void ListItemsAdded(size_t start, size_t count) OVERRIDE { + virtual void ListItemsAdded(size_t start, size_t count) override { added_count_ += count; } - virtual void ListItemsRemoved(size_t start, size_t count) OVERRIDE { + virtual void ListItemsRemoved(size_t start, size_t count) override { removed_count_ += count; } - virtual void ListItemMoved(size_t index, size_t target_index) OVERRIDE { + virtual void ListItemMoved(size_t index, size_t target_index) override { ++moved_count_; } - virtual void ListItemsChanged(size_t start, size_t count) OVERRIDE { + virtual void ListItemsChanged(size_t start, size_t count) override { changed_count_ += count; } diff --git a/ui/base/models/simple_combobox_model.h b/ui/base/models/simple_combobox_model.h index c978ec9..4aa28c3 100644 --- a/ui/base/models/simple_combobox_model.h +++ b/ui/base/models/simple_combobox_model.h @@ -19,10 +19,10 @@ class UI_BASE_EXPORT SimpleComboboxModel : public ComboboxModel { virtual ~SimpleComboboxModel(); // ui::ComboboxModel: - virtual int GetItemCount() const OVERRIDE; - virtual base::string16 GetItemAt(int index) OVERRIDE; - virtual bool IsItemSeparatorAt(int index) OVERRIDE; - virtual int GetDefaultIndex() const OVERRIDE; + virtual int GetItemCount() const override; + virtual base::string16 GetItemAt(int index) override; + virtual bool IsItemSeparatorAt(int index) override; + virtual int GetDefaultIndex() const override; private: const std::vector<base::string16> items_; diff --git a/ui/base/models/simple_menu_model.h b/ui/base/models/simple_menu_model.h index 78c8fd6..f1238dd 100644 --- a/ui/base/models/simple_menu_model.h +++ b/ui/base/models/simple_menu_model.h @@ -140,33 +140,33 @@ class UI_BASE_EXPORT SimpleMenuModel : public MenuModel { int GetIndexOfCommandId(int command_id); // Overridden from MenuModel: - virtual bool HasIcons() const OVERRIDE; - virtual int GetItemCount() const OVERRIDE; - virtual ItemType GetTypeAt(int index) const OVERRIDE; - virtual ui::MenuSeparatorType GetSeparatorTypeAt(int index) const OVERRIDE; - virtual int GetCommandIdAt(int index) const OVERRIDE; - virtual base::string16 GetLabelAt(int index) const OVERRIDE; - virtual base::string16 GetSublabelAt(int index) const OVERRIDE; - virtual base::string16 GetMinorTextAt(int index) const OVERRIDE; - virtual bool IsItemDynamicAt(int index) const OVERRIDE; + virtual bool HasIcons() const override; + virtual int GetItemCount() const override; + virtual ItemType GetTypeAt(int index) const override; + virtual ui::MenuSeparatorType GetSeparatorTypeAt(int index) const override; + virtual int GetCommandIdAt(int index) const override; + virtual base::string16 GetLabelAt(int index) const override; + virtual base::string16 GetSublabelAt(int index) const override; + virtual base::string16 GetMinorTextAt(int index) const override; + virtual bool IsItemDynamicAt(int index) const override; virtual bool GetAcceleratorAt(int index, - ui::Accelerator* accelerator) const OVERRIDE; - virtual bool IsItemCheckedAt(int index) const OVERRIDE; - virtual int GetGroupIdAt(int index) const OVERRIDE; - virtual bool GetIconAt(int index, gfx::Image* icon) OVERRIDE; + ui::Accelerator* accelerator) const override; + virtual bool IsItemCheckedAt(int index) const override; + virtual int GetGroupIdAt(int index) const override; + virtual bool GetIconAt(int index, gfx::Image* icon) override; virtual ui::ButtonMenuItemModel* GetButtonMenuItemAt( - int index) const OVERRIDE; - virtual bool IsEnabledAt(int index) const OVERRIDE; - virtual bool IsVisibleAt(int index) const OVERRIDE; - virtual void HighlightChangedTo(int index) OVERRIDE; - virtual void ActivatedAt(int index) OVERRIDE; - virtual void ActivatedAt(int index, int event_flags) OVERRIDE; - virtual MenuModel* GetSubmenuModelAt(int index) const OVERRIDE; - virtual void MenuWillShow() OVERRIDE; - virtual void MenuClosed() OVERRIDE; + int index) const override; + virtual bool IsEnabledAt(int index) const override; + virtual bool IsVisibleAt(int index) const override; + virtual void HighlightChangedTo(int index) override; + virtual void ActivatedAt(int index) override; + virtual void ActivatedAt(int index, int event_flags) override; + virtual MenuModel* GetSubmenuModelAt(int index) const override; + virtual void MenuWillShow() override; + virtual void MenuClosed() override; virtual void SetMenuModelDelegate( - ui::MenuModelDelegate* menu_model_delegate) OVERRIDE; - virtual MenuModelDelegate* GetMenuModelDelegate() const OVERRIDE; + ui::MenuModelDelegate* menu_model_delegate) override; + virtual MenuModelDelegate* GetMenuModelDelegate() const override; protected: void set_delegate(Delegate* delegate) { delegate_ = delegate; } diff --git a/ui/base/models/tree_node_model.h b/ui/base/models/tree_node_model.h index 003d20f..5df2481 100644 --- a/ui/base/models/tree_node_model.h +++ b/ui/base/models/tree_node_model.h @@ -154,7 +154,7 @@ class TreeNode : public TreeModelNode { virtual void SetTitle(const base::string16& title) { title_ = title; } // TreeModelNode: - virtual const base::string16& GetTitle() const OVERRIDE { return title_; } + virtual const base::string16& GetTitle() const override { return title_; } // Returns true if this == ancestor, or one of this nodes parents is // ancestor. @@ -251,40 +251,40 @@ class TreeNodeModel : public TreeModel { } // TreeModel: - virtual NodeType* GetRoot() OVERRIDE { + virtual NodeType* GetRoot() override { return root_.get(); } - virtual int GetChildCount(TreeModelNode* parent) OVERRIDE { + virtual int GetChildCount(TreeModelNode* parent) override { DCHECK(parent); return AsNode(parent)->child_count(); } - virtual NodeType* GetChild(TreeModelNode* parent, int index) OVERRIDE { + virtual NodeType* GetChild(TreeModelNode* parent, int index) override { DCHECK(parent); return AsNode(parent)->GetChild(index); } - virtual int GetIndexOf(TreeModelNode* parent, TreeModelNode* child) OVERRIDE { + virtual int GetIndexOf(TreeModelNode* parent, TreeModelNode* child) override { DCHECK(parent); return AsNode(parent)->GetIndexOf(AsNode(child)); } - virtual TreeModelNode* GetParent(TreeModelNode* node) OVERRIDE { + virtual TreeModelNode* GetParent(TreeModelNode* node) override { DCHECK(node); return AsNode(node)->parent(); } - virtual void AddObserver(TreeModelObserver* observer) OVERRIDE { + virtual void AddObserver(TreeModelObserver* observer) override { observer_list_.AddObserver(observer); } - virtual void RemoveObserver(TreeModelObserver* observer) OVERRIDE { + virtual void RemoveObserver(TreeModelObserver* observer) override { observer_list_.RemoveObserver(observer); } virtual void SetTitle(TreeModelNode* node, - const base::string16& title) OVERRIDE { + const base::string16& title) override { DCHECK(node); AsNode(node)->SetTitle(title); NotifyObserverTreeNodeChanged(node); diff --git a/ui/base/models/tree_node_model_unittest.cc b/ui/base/models/tree_node_model_unittest.cc index d9d387c..d1a5c88 100644 --- a/ui/base/models/tree_node_model_unittest.cc +++ b/ui/base/models/tree_node_model_unittest.cc @@ -37,16 +37,16 @@ class TreeNodeModelTest : public testing::Test, public TreeModelObserver { virtual void TreeNodesAdded(TreeModel* model, TreeModelNode* parent, int start, - int count) OVERRIDE { + int count) override { added_count_++; } virtual void TreeNodesRemoved(TreeModel* model, TreeModelNode* parent, int start, - int count) OVERRIDE { + int count) override { removed_count_++; } - virtual void TreeNodeChanged(TreeModel* model, TreeModelNode* node) OVERRIDE { + virtual void TreeNodeChanged(TreeModel* model, TreeModelNode* node) override { changed_count_++; } diff --git a/ui/base/resource/data_pack.h b/ui/base/resource/data_pack.h index 2eeb1b2..70cf242 100644 --- a/ui/base/resource/data_pack.h +++ b/ui/base/resource/data_pack.h @@ -51,13 +51,13 @@ class UI_BASE_EXPORT DataPack : public ResourceHandle { TextEncodingType textEncodingType); // ResourceHandle implementation: - virtual bool HasResource(uint16 resource_id) const OVERRIDE; + virtual bool HasResource(uint16 resource_id) const override; virtual bool GetStringPiece(uint16 resource_id, - base::StringPiece* data) const OVERRIDE; + base::StringPiece* data) const override; virtual base::RefCountedStaticMemory* GetStaticMemory( - uint16 resource_id) const OVERRIDE; - virtual TextEncodingType GetTextEncodingType() const OVERRIDE; - virtual ui::ScaleFactor GetScaleFactor() const OVERRIDE; + uint16 resource_id) const override; + virtual TextEncodingType GetTextEncodingType() const override; + virtual ui::ScaleFactor GetScaleFactor() const override; private: // Does the actual loading of a pack file. Called by Load and LoadFromFile. diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc index b19133a..37f6c77 100644 --- a/ui/base/resource/resource_bundle.cc +++ b/ui/base/resource/resource_bundle.cc @@ -127,7 +127,7 @@ class ResourceBundle::ResourceBundleImageSource : public gfx::ImageSkiaSource { virtual ~ResourceBundleImageSource() {} // gfx::ImageSkiaSource overrides: - virtual gfx::ImageSkiaRep GetImageForScale(float scale) OVERRIDE { + virtual gfx::ImageSkiaRep GetImageForScale(float scale) override { SkBitmap image; bool fell_back_to_1x = false; ScaleFactor scale_factor = GetSupportedScaleFactor(scale); diff --git a/ui/base/resource/resource_bundle_unittest.cc b/ui/base/resource/resource_bundle_unittest.cc index 6a3f71e..488947d 100644 --- a/ui/base/resource/resource_bundle_unittest.cc +++ b/ui/base/resource/resource_bundle_unittest.cc @@ -77,20 +77,20 @@ class MockResourceBundleDelegate : public ui::ResourceBundle::Delegate { ui::ScaleFactor scale_factor)); virtual bool GetRawDataResource(int resource_id, ui::ScaleFactor scale_factor, - base::StringPiece* value) OVERRIDE { + base::StringPiece* value) override { *value = GetRawDataResourceMock(resource_id, scale_factor); return true; } MOCK_METHOD1(GetLocalizedStringMock, base::string16(int message_id)); virtual bool GetLocalizedString(int message_id, - base::string16* value) OVERRIDE { + base::string16* value) override { *value = GetLocalizedStringMock(message_id); return true; } MOCK_METHOD1(GetFontMock, gfx::Font*(ui::ResourceBundle::FontStyle style)); virtual scoped_ptr<gfx::Font> GetFont( - ui::ResourceBundle::FontStyle style) OVERRIDE { + ui::ResourceBundle::FontStyle style) override { return scoped_ptr<gfx::Font>(GetFontMock(style)); } }; @@ -153,7 +153,7 @@ class ResourceBundleTest : public testing::Test { } // Overridden from testing::Test: - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { delete resource_bundle_; } @@ -383,7 +383,7 @@ class ResourceBundleImageTest : public ResourceBundleTest { virtual ~ResourceBundleImageTest() { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { // Create a temporary directory to write test resource bundles to. ASSERT_TRUE(dir_.CreateUniqueTempDir()); } diff --git a/ui/base/resource/resource_data_dll_win.h b/ui/base/resource/resource_data_dll_win.h index d45ac83..0aad558 100644 --- a/ui/base/resource/resource_data_dll_win.h +++ b/ui/base/resource/resource_data_dll_win.h @@ -18,13 +18,13 @@ class ResourceDataDLL : public ResourceHandle { virtual ~ResourceDataDLL(); // ResourceHandle implementation: - virtual bool HasResource(uint16 resource_id) const OVERRIDE; + virtual bool HasResource(uint16 resource_id) const override; virtual bool GetStringPiece(uint16 resource_id, - base::StringPiece* data) const OVERRIDE; + base::StringPiece* data) const override; virtual base::RefCountedStaticMemory* GetStaticMemory( - uint16 resource_id) const OVERRIDE; - virtual TextEncodingType GetTextEncodingType() const OVERRIDE; - virtual ScaleFactor GetScaleFactor() const OVERRIDE; + uint16 resource_id) const override; + virtual TextEncodingType GetTextEncodingType() const override; + virtual ScaleFactor GetScaleFactor() const override; private: const HINSTANCE module_; diff --git a/ui/base/test/run_all_unittests.cc b/ui/base/test/run_all_unittests.cc index 26885c8..1254d97 100644 --- a/ui/base/test/run_all_unittests.cc +++ b/ui/base/test/run_all_unittests.cc @@ -33,8 +33,8 @@ class UIBaseTestSuite : public base::TestSuite { protected: // base::TestSuite: - virtual void Initialize() OVERRIDE; - virtual void Shutdown() OVERRIDE; + virtual void Initialize() override; + virtual void Shutdown() override; private: DISALLOW_COPY_AND_ASSIGN(UIBaseTestSuite); diff --git a/ui/base/win/hwnd_subclass_unittest.cc b/ui/base/win/hwnd_subclass_unittest.cc index 520f52b..b037db9 100644 --- a/ui/base/win/hwnd_subclass_unittest.cc +++ b/ui/base/win/hwnd_subclass_unittest.cc @@ -26,7 +26,7 @@ class TestWindow : public gfx::WindowImpl { WPARAM w_param, LPARAM l_param, LRESULT& result, - DWORD msg_map_id) OVERRIDE { + DWORD msg_map_id) override { if (message == WM_NCHITTEST) saw_message = true; @@ -54,7 +54,7 @@ class TestMessageFilter : public HWNDMessageFilter { UINT message, WPARAM w_param, LPARAM l_param, - LRESULT* l_result) OVERRIDE { + LRESULT* l_result) override { if (message == WM_NCHITTEST) { saw_message = true; return consume_messages; diff --git a/ui/base/x/selection_requestor_unittest.cc b/ui/base/x/selection_requestor_unittest.cc index fe6ee42..f2c7b03 100644 --- a/ui/base/x/selection_requestor_unittest.cc +++ b/ui/base/x/selection_requestor_unittest.cc @@ -65,7 +65,7 @@ class SelectionRequestorTest : public testing::Test { } protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { // Make X11 synchronous for our display connection. XSynchronize(x_display_, True); @@ -85,7 +85,7 @@ class SelectionRequestorTest : public testing::Test { requestor_.reset(new SelectionRequestor(x_display_, x_window_, NULL)); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { requestor_.reset(); event_source_.reset(); XDestroyWindow(x_display_, x_window_); diff --git a/ui/base/x/x11_util.h b/ui/base/x/x11_util.h index 42e928f..e7b3842 100644 --- a/ui/base/x/x11_util.h +++ b/ui/base/x/x11_util.h @@ -295,8 +295,8 @@ class UI_BASE_EXPORT XRefcountedMemory : public base::RefCountedMemory { : x11_data_(length ? x11_data : NULL), length_(length) {} // Overridden from RefCountedMemory: - virtual const unsigned char* front() const OVERRIDE; - virtual size_t size() const OVERRIDE; + virtual const unsigned char* front() const override; + virtual size_t size() const override; private: virtual ~XRefcountedMemory(); diff --git a/ui/chromeos/network/network_icon.cc b/ui/chromeos/network/network_icon.cc index 3d274d5..c5cddd6 100644 --- a/ui/chromeos/network/network_icon.cc +++ b/ui/chromeos/network/network_icon.cc @@ -214,7 +214,7 @@ class EmptyImageSource: public gfx::ImageSkiaSource { : size_(size) { } - virtual gfx::ImageSkiaRep GetImageForScale(float scale) OVERRIDE { + virtual gfx::ImageSkiaRep GetImageForScale(float scale) override { gfx::Size pixel_size = gfx::ToFlooredSize(gfx::ScaleSize(size_, scale)); SkBitmap empty_bitmap = GetEmptyBitmap(pixel_size); return gfx::ImageSkiaRep(empty_bitmap, scale); @@ -237,7 +237,7 @@ class NetworkIconImageSource : public gfx::ImageSkiaSource { // TODO(pkotwicz): Figure out what to do when a new image resolution becomes // available. - virtual gfx::ImageSkiaRep GetImageForScale(float scale) OVERRIDE { + virtual gfx::ImageSkiaRep GetImageForScale(float scale) override { gfx::ImageSkiaRep icon_rep = icon_.GetRepresentation(scale); if (icon_rep.is_null()) return gfx::ImageSkiaRep(); diff --git a/ui/chromeos/network/network_icon_animation.h b/ui/chromeos/network/network_icon_animation.h index ad73bb2..8877f5d 100644 --- a/ui/chromeos/network/network_icon_animation.h +++ b/ui/chromeos/network/network_icon_animation.h @@ -33,7 +33,7 @@ class UI_CHROMEOS_EXPORT NetworkIconAnimation : public gfx::AnimationDelegate { void RemoveObserver(AnimationObserver* observer); // gfx::AnimationDelegate implementation. - virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE; + virtual void AnimationProgressed(const gfx::Animation* animation) override; static NetworkIconAnimation* GetInstance(); diff --git a/ui/chromeos/network/network_list.h b/ui/chromeos/network/network_list.h index 96e9ea1..ca98f5d 100644 --- a/ui/chromeos/network/network_list.h +++ b/ui/chromeos/network/network_list.h @@ -51,7 +51,7 @@ class UI_CHROMEOS_EXPORT NetworkListView bool UpdateInfoLabel(int message_id, int index, views::Label** label); // network_icon::AnimationObserver: - virtual void NetworkIconChanged() OVERRIDE; + virtual void NetworkIconChanged() override; NetworkListDelegate* delegate_; views::View* content_; diff --git a/ui/chromeos/touch_exploration_controller.h b/ui/chromeos/touch_exploration_controller.h index 3cf4be0..2f428a5 100644 --- a/ui/chromeos/touch_exploration_controller.h +++ b/ui/chromeos/touch_exploration_controller.h @@ -177,9 +177,9 @@ class UI_CHROMEOS_EXPORT TouchExplorationController // Overridden from ui::EventRewriter virtual ui::EventRewriteStatus RewriteEvent( const ui::Event& event, - scoped_ptr<ui::Event>* rewritten_event) OVERRIDE; + scoped_ptr<ui::Event>* rewritten_event) override; virtual ui::EventRewriteStatus NextDispatchEvent( - const ui::Event& last_event, scoped_ptr<ui::Event>* new_event) OVERRIDE; + const ui::Event& last_event, scoped_ptr<ui::Event>* new_event) override; // Event handlers based on the current state - see State, below. ui::EventRewriteStatus InNoFingersDown( @@ -235,7 +235,7 @@ class UI_CHROMEOS_EXPORT TouchExplorationController // the user moves fast enough to trigger a gesture. After the user // completes their gesture, this method will decide what keyboard // input their gesture corresponded to. - virtual void OnGestureEvent(ui::GestureEvent* gesture) OVERRIDE; + virtual void OnGestureEvent(ui::GestureEvent* gesture) override; // Process the gesture events that have been created. void ProcessGestureEvents(); diff --git a/ui/chromeos/touch_exploration_controller_unittest.cc b/ui/chromeos/touch_exploration_controller_unittest.cc index c43885e..3fabbe7 100644 --- a/ui/chromeos/touch_exploration_controller_unittest.cc +++ b/ui/chromeos/touch_exploration_controller_unittest.cc @@ -33,7 +33,7 @@ class EventCapturer : public ui::EventHandler { events_.clear(); } - virtual void OnEvent(ui::Event* event) OVERRIDE { + virtual void OnEvent(ui::Event* event) override { if (event->IsMouseEvent()) { events_.push_back( new ui::MouseEvent(static_cast<ui::MouseEvent&>(*event))); @@ -75,21 +75,21 @@ int Factorial(int n) { class MockTouchExplorationControllerDelegate : public ui::TouchExplorationControllerDelegate { public: - virtual void SetOutputLevel(int volume) OVERRIDE { + virtual void SetOutputLevel(int volume) override { volume_changes_.push_back(volume); } - virtual void SilenceSpokenFeedback() OVERRIDE { + virtual void SilenceSpokenFeedback() override { } - virtual void PlayVolumeAdjustEarcon() OVERRIDE { + virtual void PlayVolumeAdjustEarcon() override { ++num_times_adjust_sound_played_; } - virtual void PlayPassthroughEarcon() OVERRIDE { + virtual void PlayPassthroughEarcon() override { ++num_times_passthrough_played_; } - virtual void PlayExitScreenEarcon() OVERRIDE { + virtual void PlayExitScreenEarcon() override { ++num_times_exit_screen_played_; } - virtual void PlayEnterScreenEarcon() OVERRIDE { + virtual void PlayEnterScreenEarcon() override { ++num_times_enter_screen_played_; } @@ -204,7 +204,7 @@ class TouchExplorationTest : public aura::test::AuraTestBase { } virtual ~TouchExplorationTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { if (gfx::GetGLImplementation() == gfx::kGLImplementationNone) gfx::GLSurface::InitializeOneOffForTests(); aura::test::AuraTestBase::SetUp(); @@ -217,7 +217,7 @@ class TouchExplorationTest : public aura::test::AuraTestBase { cursor_client()->DisableMouseEvents(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { root_window()->RemovePreTargetHandler(&event_capturer_); SwitchTouchExplorationMode(false); cursor_client_.reset(); diff --git a/ui/chromeos/user_activity_power_manager_notifier.h b/ui/chromeos/user_activity_power_manager_notifier.h index 483f1b5..47cbcf9 100644 --- a/ui/chromeos/user_activity_power_manager_notifier.h +++ b/ui/chromeos/user_activity_power_manager_notifier.h @@ -26,7 +26,7 @@ class UI_CHROMEOS_EXPORT UserActivityPowerManagerNotifier virtual ~UserActivityPowerManagerNotifier(); // UserActivityObserver implementation. - virtual void OnUserActivity(const Event* event) OVERRIDE; + virtual void OnUserActivity(const Event* event) override; private: ::wm::UserActivityDetector* detector_; // not owned diff --git a/ui/compositor/closure_animation_observer.h b/ui/compositor/closure_animation_observer.h index 320ea2b1..638960a8 100644 --- a/ui/compositor/closure_animation_observer.h +++ b/ui/compositor/closure_animation_observer.h @@ -23,7 +23,7 @@ class COMPOSITOR_EXPORT ClosureAnimationObserver virtual ~ClosureAnimationObserver(); // ImplicitAnimationObserver: - virtual void OnImplicitAnimationsCompleted() OVERRIDE; + virtual void OnImplicitAnimationsCompleted() override; const base::Closure closure_; diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h index 72390d0..9426255 100644 --- a/ui/compositor/compositor.h +++ b/ui/compositor/compositor.h @@ -223,29 +223,29 @@ class COMPOSITOR_EXPORT Compositor void OnSwapBuffersAborted(); // LayerTreeHostClient implementation. - virtual void WillBeginMainFrame(int frame_id) OVERRIDE {} - virtual void DidBeginMainFrame() OVERRIDE {} - virtual void BeginMainFrame(const cc::BeginFrameArgs& args) OVERRIDE; - virtual void Layout() OVERRIDE; + virtual void WillBeginMainFrame(int frame_id) override {} + virtual void DidBeginMainFrame() override {} + virtual void BeginMainFrame(const cc::BeginFrameArgs& args) override; + virtual void Layout() override; virtual void ApplyViewportDeltas( const gfx::Vector2d& inner_delta, const gfx::Vector2d& outer_delta, float page_scale, - float top_controls_delta) OVERRIDE {} + float top_controls_delta) override {} virtual void ApplyViewportDeltas( const gfx::Vector2d& scroll_delta, float page_scale, - float top_controls_delta) OVERRIDE {} - virtual void RequestNewOutputSurface(bool fallback) OVERRIDE; - virtual void DidInitializeOutputSurface() OVERRIDE {} - virtual void WillCommit() OVERRIDE {} - virtual void DidCommit() OVERRIDE; - virtual void DidCommitAndDrawFrame() OVERRIDE; - virtual void DidCompleteSwapBuffers() OVERRIDE; + float top_controls_delta) override {} + virtual void RequestNewOutputSurface(bool fallback) override; + virtual void DidInitializeOutputSurface() override {} + virtual void WillCommit() override {} + virtual void DidCommit() override; + virtual void DidCommitAndDrawFrame() override; + virtual void DidCompleteSwapBuffers() override; // cc::LayerTreeHostSingleThreadClient implementation. - virtual void DidPostSwapBuffers() OVERRIDE; - virtual void DidAbortSwapBuffers() OVERRIDE; + virtual void DidPostSwapBuffers() override; + virtual void DidAbortSwapBuffers() override; bool IsLocked() { return compositor_lock_ != NULL; } diff --git a/ui/compositor/float_animation_curve_adapter.h b/ui/compositor/float_animation_curve_adapter.h index 9959772..84a9992 100644 --- a/ui/compositor/float_animation_curve_adapter.h +++ b/ui/compositor/float_animation_curve_adapter.h @@ -21,9 +21,9 @@ class FloatAnimationCurveAdapter : public cc::FloatAnimationCurve { virtual ~FloatAnimationCurveAdapter() { } // FloatAnimationCurve implementation. - virtual double Duration() const OVERRIDE; - virtual scoped_ptr<cc::AnimationCurve> Clone() const OVERRIDE; - virtual float GetValue(double t) const OVERRIDE; + virtual double Duration() const override; + virtual scoped_ptr<cc::AnimationCurve> Clone() const override; + virtual float GetValue(double t) const override; private: gfx::Tween::Type tween_type_; diff --git a/ui/compositor/layer.cc b/ui/compositor/layer.cc index b08a3d0..5db6ae4 100644 --- a/ui/compositor/layer.cc +++ b/ui/compositor/layer.cc @@ -745,7 +745,7 @@ void Layer::SetForceRenderSurface(bool force) { class LayerDebugInfo : public base::debug::ConvertableToTraceFormat { public: explicit LayerDebugInfo(std::string name) : name_(name) { } - virtual void AppendAsTraceFormat(std::string* out) const OVERRIDE { + virtual void AppendAsTraceFormat(std::string* out) const override { base::DictionaryValue dictionary; dictionary.SetString("layer_name", name_); base::JSONWriter::Write(&dictionary, out); diff --git a/ui/compositor/layer.h b/ui/compositor/layer.h index d009af46..8b5f862 100644 --- a/ui/compositor/layer.h +++ b/ui/compositor/layer.h @@ -327,9 +327,9 @@ class COMPOSITOR_EXPORT Layer virtual void PaintContents( SkCanvas* canvas, const gfx::Rect& clip, - ContentLayerClient::GraphicsContextStatus gc_status) OVERRIDE; - virtual void DidChangeLayerCanUseLCDText() OVERRIDE {} - virtual bool FillsBoundsCompletely() const OVERRIDE; + ContentLayerClient::GraphicsContextStatus gc_status) override; + virtual void DidChangeLayerCanUseLCDText() override {} + virtual bool FillsBoundsCompletely() const override; cc::Layer* cc_layer() { return cc_layer_; } @@ -337,7 +337,7 @@ class COMPOSITOR_EXPORT Layer virtual bool PrepareTextureMailbox( cc::TextureMailbox* mailbox, scoped_ptr<cc::SingleReleaseCallback>* release_callback, - bool use_shared_memory) OVERRIDE; + bool use_shared_memory) override; float device_scale_factor() const { return device_scale_factor_; } @@ -348,10 +348,10 @@ class COMPOSITOR_EXPORT Layer // LayerClient virtual scoped_refptr<base::debug::ConvertableToTraceFormat> - TakeDebugInfo() OVERRIDE; + TakeDebugInfo() override; // LayerAnimationEventObserver - virtual void OnAnimationStarted(const cc::AnimationEvent& event) OVERRIDE; + virtual void OnAnimationStarted(const cc::AnimationEvent& event) override; // Whether this layer has animations waiting to get sent to its cc::Layer. bool HasPendingThreadedAnimations() { @@ -374,27 +374,27 @@ class COMPOSITOR_EXPORT Layer bool ConvertPointFromAncestor(const Layer* ancestor, gfx::Point* point) const; // Implementation of LayerAnimatorDelegate - virtual void SetBoundsFromAnimation(const gfx::Rect& bounds) OVERRIDE; + virtual void SetBoundsFromAnimation(const gfx::Rect& bounds) override; virtual void SetTransformFromAnimation( - const gfx::Transform& transform) OVERRIDE; - virtual void SetOpacityFromAnimation(float opacity) OVERRIDE; - virtual void SetVisibilityFromAnimation(bool visibility) OVERRIDE; - virtual void SetBrightnessFromAnimation(float brightness) OVERRIDE; - virtual void SetGrayscaleFromAnimation(float grayscale) OVERRIDE; - virtual void SetColorFromAnimation(SkColor color) OVERRIDE; - virtual void ScheduleDrawForAnimation() OVERRIDE; - virtual const gfx::Rect& GetBoundsForAnimation() const OVERRIDE; - virtual gfx::Transform GetTransformForAnimation() const OVERRIDE; - virtual float GetOpacityForAnimation() const OVERRIDE; - virtual bool GetVisibilityForAnimation() const OVERRIDE; - virtual float GetBrightnessForAnimation() const OVERRIDE; - virtual float GetGrayscaleForAnimation() const OVERRIDE; - virtual SkColor GetColorForAnimation() const OVERRIDE; - virtual float GetDeviceScaleFactor() const OVERRIDE; + const gfx::Transform& transform) override; + virtual void SetOpacityFromAnimation(float opacity) override; + virtual void SetVisibilityFromAnimation(bool visibility) override; + virtual void SetBrightnessFromAnimation(float brightness) override; + virtual void SetGrayscaleFromAnimation(float grayscale) override; + virtual void SetColorFromAnimation(SkColor color) override; + virtual void ScheduleDrawForAnimation() override; + virtual const gfx::Rect& GetBoundsForAnimation() const override; + virtual gfx::Transform GetTransformForAnimation() const override; + virtual float GetOpacityForAnimation() const override; + virtual bool GetVisibilityForAnimation() const override; + virtual float GetBrightnessForAnimation() const override; + virtual float GetGrayscaleForAnimation() const override; + virtual SkColor GetColorForAnimation() const override; + virtual float GetDeviceScaleFactor() const override; virtual void AddThreadedAnimation( - scoped_ptr<cc::Animation> animation) OVERRIDE; - virtual void RemoveThreadedAnimation(int animation_id) OVERRIDE; - virtual LayerAnimatorCollection* GetLayerAnimatorCollection() OVERRIDE; + scoped_ptr<cc::Animation> animation) override; + virtual void RemoveThreadedAnimation(int animation_id) override; + virtual LayerAnimatorCollection* GetLayerAnimatorCollection() override; // Creates a corresponding composited layer for |type_|. void CreateWebLayer(); diff --git a/ui/compositor/layer_animation_element.cc b/ui/compositor/layer_animation_element.cc index ade7765..b74aebc 100644 --- a/ui/compositor/layer_animation_element.cc +++ b/ui/compositor/layer_animation_element.cc @@ -35,13 +35,13 @@ class Pause : public LayerAnimationElement { virtual ~Pause() {} private: - virtual void OnStart(LayerAnimationDelegate* delegate) OVERRIDE {} + virtual void OnStart(LayerAnimationDelegate* delegate) override {} virtual bool OnProgress(double t, - LayerAnimationDelegate* delegate) OVERRIDE { + LayerAnimationDelegate* delegate) override { return false; } - virtual void OnGetTarget(TargetValue* target) const OVERRIDE {} - virtual void OnAbort(LayerAnimationDelegate* delegate) OVERRIDE {} + virtual void OnGetTarget(TargetValue* target) const override {} + virtual void OnAbort(LayerAnimationDelegate* delegate) override {} DISALLOW_COPY_AND_ASSIGN(Pause); }; @@ -57,21 +57,21 @@ class TransformTransition : public LayerAnimationElement { virtual ~TransformTransition() {} protected: - virtual void OnStart(LayerAnimationDelegate* delegate) OVERRIDE { + virtual void OnStart(LayerAnimationDelegate* delegate) override { start_ = delegate->GetTransformForAnimation(); } - virtual bool OnProgress(double t, LayerAnimationDelegate* delegate) OVERRIDE { + virtual bool OnProgress(double t, LayerAnimationDelegate* delegate) override { delegate->SetTransformFromAnimation( gfx::Tween::TransformValueBetween(t, start_, target_)); return true; } - virtual void OnGetTarget(TargetValue* target) const OVERRIDE { + virtual void OnGetTarget(TargetValue* target) const override { target->transform = target_; } - virtual void OnAbort(LayerAnimationDelegate* delegate) OVERRIDE {} + virtual void OnAbort(LayerAnimationDelegate* delegate) override {} private: gfx::Transform start_; @@ -92,20 +92,20 @@ class InterpolatedTransformTransition : public LayerAnimationElement { virtual ~InterpolatedTransformTransition() {} protected: - virtual void OnStart(LayerAnimationDelegate* delegate) OVERRIDE { + virtual void OnStart(LayerAnimationDelegate* delegate) override { } - virtual bool OnProgress(double t, LayerAnimationDelegate* delegate) OVERRIDE { + virtual bool OnProgress(double t, LayerAnimationDelegate* delegate) override { delegate->SetTransformFromAnimation( interpolated_transform_->Interpolate(static_cast<float>(t))); return true; } - virtual void OnGetTarget(TargetValue* target) const OVERRIDE { + virtual void OnGetTarget(TargetValue* target) const override { target->transform = interpolated_transform_->Interpolate(1.0f); } - virtual void OnAbort(LayerAnimationDelegate* delegate) OVERRIDE {} + virtual void OnAbort(LayerAnimationDelegate* delegate) override {} private: scoped_ptr<InterpolatedTransform> interpolated_transform_; @@ -124,21 +124,21 @@ class BoundsTransition : public LayerAnimationElement { virtual ~BoundsTransition() {} protected: - virtual void OnStart(LayerAnimationDelegate* delegate) OVERRIDE { + virtual void OnStart(LayerAnimationDelegate* delegate) override { start_ = delegate->GetBoundsForAnimation(); } - virtual bool OnProgress(double t, LayerAnimationDelegate* delegate) OVERRIDE { + virtual bool OnProgress(double t, LayerAnimationDelegate* delegate) override { delegate->SetBoundsFromAnimation( gfx::Tween::RectValueBetween(t, start_, target_)); return true; } - virtual void OnGetTarget(TargetValue* target) const OVERRIDE { + virtual void OnGetTarget(TargetValue* target) const override { target->bounds = target_; } - virtual void OnAbort(LayerAnimationDelegate* delegate) OVERRIDE {} + virtual void OnAbort(LayerAnimationDelegate* delegate) override {} private: gfx::Rect start_; @@ -159,21 +159,21 @@ class OpacityTransition : public LayerAnimationElement { virtual ~OpacityTransition() {} protected: - virtual void OnStart(LayerAnimationDelegate* delegate) OVERRIDE { + virtual void OnStart(LayerAnimationDelegate* delegate) override { start_ = delegate->GetOpacityForAnimation(); } - virtual bool OnProgress(double t, LayerAnimationDelegate* delegate) OVERRIDE { + virtual bool OnProgress(double t, LayerAnimationDelegate* delegate) override { delegate->SetOpacityFromAnimation( gfx::Tween::FloatValueBetween(t, start_, target_)); return true; } - virtual void OnGetTarget(TargetValue* target) const OVERRIDE { + virtual void OnGetTarget(TargetValue* target) const override { target->opacity = target_; } - virtual void OnAbort(LayerAnimationDelegate* delegate) OVERRIDE {} + virtual void OnAbort(LayerAnimationDelegate* delegate) override {} private: float start_; @@ -194,20 +194,20 @@ class VisibilityTransition : public LayerAnimationElement { virtual ~VisibilityTransition() {} protected: - virtual void OnStart(LayerAnimationDelegate* delegate) OVERRIDE { + virtual void OnStart(LayerAnimationDelegate* delegate) override { start_ = delegate->GetVisibilityForAnimation(); } - virtual bool OnProgress(double t, LayerAnimationDelegate* delegate) OVERRIDE { + virtual bool OnProgress(double t, LayerAnimationDelegate* delegate) override { delegate->SetVisibilityFromAnimation(t == 1.0 ? target_ : start_); return t == 1.0; } - virtual void OnGetTarget(TargetValue* target) const OVERRIDE { + virtual void OnGetTarget(TargetValue* target) const override { target->visibility = target_; } - virtual void OnAbort(LayerAnimationDelegate* delegate) OVERRIDE {} + virtual void OnAbort(LayerAnimationDelegate* delegate) override {} private: bool start_; @@ -228,21 +228,21 @@ class BrightnessTransition : public LayerAnimationElement { virtual ~BrightnessTransition() {} protected: - virtual void OnStart(LayerAnimationDelegate* delegate) OVERRIDE { + virtual void OnStart(LayerAnimationDelegate* delegate) override { start_ = delegate->GetBrightnessForAnimation(); } - virtual bool OnProgress(double t, LayerAnimationDelegate* delegate) OVERRIDE { + virtual bool OnProgress(double t, LayerAnimationDelegate* delegate) override { delegate->SetBrightnessFromAnimation( gfx::Tween::FloatValueBetween(t, start_, target_)); return true; } - virtual void OnGetTarget(TargetValue* target) const OVERRIDE { + virtual void OnGetTarget(TargetValue* target) const override { target->brightness = target_; } - virtual void OnAbort(LayerAnimationDelegate* delegate) OVERRIDE {} + virtual void OnAbort(LayerAnimationDelegate* delegate) override {} private: float start_; @@ -263,21 +263,21 @@ class GrayscaleTransition : public LayerAnimationElement { virtual ~GrayscaleTransition() {} protected: - virtual void OnStart(LayerAnimationDelegate* delegate) OVERRIDE { + virtual void OnStart(LayerAnimationDelegate* delegate) override { start_ = delegate->GetGrayscaleForAnimation(); } - virtual bool OnProgress(double t, LayerAnimationDelegate* delegate) OVERRIDE { + virtual bool OnProgress(double t, LayerAnimationDelegate* delegate) override { delegate->SetGrayscaleFromAnimation( gfx::Tween::FloatValueBetween(t, start_, target_)); return true; } - virtual void OnGetTarget(TargetValue* target) const OVERRIDE { + virtual void OnGetTarget(TargetValue* target) const override { target->grayscale = target_; } - virtual void OnAbort(LayerAnimationDelegate* delegate) OVERRIDE {} + virtual void OnAbort(LayerAnimationDelegate* delegate) override {} private: float start_; @@ -298,21 +298,21 @@ class ColorTransition : public LayerAnimationElement { virtual ~ColorTransition() {} protected: - virtual void OnStart(LayerAnimationDelegate* delegate) OVERRIDE { + virtual void OnStart(LayerAnimationDelegate* delegate) override { start_ = delegate->GetColorForAnimation(); } - virtual bool OnProgress(double t, LayerAnimationDelegate* delegate) OVERRIDE { + virtual bool OnProgress(double t, LayerAnimationDelegate* delegate) override { delegate->SetColorFromAnimation( gfx::Tween::ColorValueBetween(t, start_, target_)); return true; } - virtual void OnGetTarget(TargetValue* target) const OVERRIDE { + virtual void OnGetTarget(TargetValue* target) const override { target->color = target_; } - virtual void OnAbort(LayerAnimationDelegate* delegate) OVERRIDE {} + virtual void OnAbort(LayerAnimationDelegate* delegate) override {} private: SkColor start_; @@ -331,7 +331,7 @@ class ThreadedLayerAnimationElement : public LayerAnimationElement { } virtual ~ThreadedLayerAnimationElement() {} - virtual bool IsThreaded() const OVERRIDE { + virtual bool IsThreaded() const override { return (duration() != base::TimeDelta()); } @@ -341,7 +341,7 @@ class ThreadedLayerAnimationElement : public LayerAnimationElement { } virtual bool OnProgress(double t, - LayerAnimationDelegate* delegate) OVERRIDE { + LayerAnimationDelegate* delegate) override { if (t < 1.0) return false; @@ -353,14 +353,14 @@ class ThreadedLayerAnimationElement : public LayerAnimationElement { return true; } - virtual void OnAbort(LayerAnimationDelegate* delegate) OVERRIDE { + virtual void OnAbort(LayerAnimationDelegate* delegate) override { if (delegate && Started()) { delegate->RemoveThreadedAnimation(animation_id()); } } virtual void RequestEffectiveStart( - LayerAnimationDelegate* delegate) OVERRIDE { + LayerAnimationDelegate* delegate) override { DCHECK(animation_group_id()); if (duration() == base::TimeDelta()) { set_effective_start_time(requested_start_time()); @@ -392,11 +392,11 @@ class ThreadedOpacityTransition : public ThreadedLayerAnimationElement { virtual ~ThreadedOpacityTransition() {} protected: - virtual void OnStart(LayerAnimationDelegate* delegate) OVERRIDE { + virtual void OnStart(LayerAnimationDelegate* delegate) override { start_ = delegate->GetOpacityForAnimation(); } - virtual void OnAbort(LayerAnimationDelegate* delegate) OVERRIDE { + virtual void OnAbort(LayerAnimationDelegate* delegate) override { if (delegate && Started()) { ThreadedLayerAnimationElement::OnAbort(delegate); delegate->SetOpacityFromAnimation(gfx::Tween::FloatValueBetween( @@ -406,11 +406,11 @@ class ThreadedOpacityTransition : public ThreadedLayerAnimationElement { } } - virtual void OnEnd(LayerAnimationDelegate* delegate) OVERRIDE { + virtual void OnEnd(LayerAnimationDelegate* delegate) override { delegate->SetOpacityFromAnimation(target_); } - virtual scoped_ptr<cc::Animation> CreateCCAnimation() OVERRIDE { + virtual scoped_ptr<cc::Animation> CreateCCAnimation() override { scoped_ptr<cc::AnimationCurve> animation_curve( new FloatAnimationCurveAdapter(tween_type(), start_, @@ -424,7 +424,7 @@ class ThreadedOpacityTransition : public ThreadedLayerAnimationElement { return animation.Pass(); } - virtual void OnGetTarget(TargetValue* target) const OVERRIDE { + virtual void OnGetTarget(TargetValue* target) const override { target->opacity = target_; } @@ -447,11 +447,11 @@ class ThreadedTransformTransition : public ThreadedLayerAnimationElement { virtual ~ThreadedTransformTransition() {} protected: - virtual void OnStart(LayerAnimationDelegate* delegate) OVERRIDE { + virtual void OnStart(LayerAnimationDelegate* delegate) override { start_ = delegate->GetTransformForAnimation(); } - virtual void OnAbort(LayerAnimationDelegate* delegate) OVERRIDE { + virtual void OnAbort(LayerAnimationDelegate* delegate) override { if (delegate && Started()) { ThreadedLayerAnimationElement::OnAbort(delegate); delegate->SetTransformFromAnimation(gfx::Tween::TransformValueBetween( @@ -461,11 +461,11 @@ class ThreadedTransformTransition : public ThreadedLayerAnimationElement { } } - virtual void OnEnd(LayerAnimationDelegate* delegate) OVERRIDE { + virtual void OnEnd(LayerAnimationDelegate* delegate) override { delegate->SetTransformFromAnimation(target_); } - virtual scoped_ptr<cc::Animation> CreateCCAnimation() OVERRIDE { + virtual scoped_ptr<cc::Animation> CreateCCAnimation() override { scoped_ptr<cc::AnimationCurve> animation_curve( new TransformAnimationCurveAdapter(tween_type(), start_, @@ -479,7 +479,7 @@ class ThreadedTransformTransition : public ThreadedLayerAnimationElement { return animation.Pass(); } - virtual void OnGetTarget(TargetValue* target) const OVERRIDE { + virtual void OnGetTarget(TargetValue* target) const override { target->transform = target_; } @@ -512,7 +512,7 @@ class InverseTransformTransition : public ThreadedLayerAnimationElement { } protected: - virtual void OnStart(LayerAnimationDelegate* delegate) OVERRIDE { + virtual void OnStart(LayerAnimationDelegate* delegate) override { gfx::Transform start(delegate->GetTransformForAnimation()); effective_start_ = base_transform_ * start; @@ -533,18 +533,18 @@ class InverseTransformTransition : public ThreadedLayerAnimationElement { base_target_); } - virtual void OnAbort(LayerAnimationDelegate* delegate) OVERRIDE { + virtual void OnAbort(LayerAnimationDelegate* delegate) override { if (delegate && Started()) { ThreadedLayerAnimationElement::OnAbort(delegate); delegate->SetTransformFromAnimation(ComputeCurrentTransform()); } } - virtual void OnEnd(LayerAnimationDelegate* delegate) OVERRIDE { + virtual void OnEnd(LayerAnimationDelegate* delegate) override { delegate->SetTransformFromAnimation(computed_target_transform_); } - virtual scoped_ptr<cc::Animation> CreateCCAnimation() OVERRIDE { + virtual scoped_ptr<cc::Animation> CreateCCAnimation() override { scoped_ptr<cc::Animation> animation( cc::Animation::Create(animation_curve_->Clone(), animation_id(), @@ -553,7 +553,7 @@ class InverseTransformTransition : public ThreadedLayerAnimationElement { return animation.Pass(); } - virtual void OnGetTarget(TargetValue* target) const OVERRIDE { + virtual void OnGetTarget(TargetValue* target) const override { target->transform = computed_target_transform_; } diff --git a/ui/compositor/layer_animation_observer.h b/ui/compositor/layer_animation_observer.h index 9ae389d..8db5a4a 100644 --- a/ui/compositor/layer_animation_observer.h +++ b/ui/compositor/layer_animation_observer.h @@ -43,7 +43,7 @@ class COMPOSITOR_EXPORT LayerAnimationObserver { // If the animator is destroyed during an animation, the animations are // aborted. The resulting NotifyAborted notifications will NOT be sent to - // this observer if this function returns false. NOTE: IF YOU OVERRIDE THIS + // this observer if this function returns false. NOTE: IF YOU override THIS // FUNCTION TO RETURN TRUE, YOU MUST REMEMBER TO REMOVE YOURSELF AS AN // OBSERVER WHEN YOU ARE DESTROYED. virtual bool RequiresNotificationWhenAnimatorDestroyed() const; @@ -117,15 +117,15 @@ class COMPOSITOR_EXPORT ImplicitAnimationObserver // LayerAnimationObserver implementation virtual void OnLayerAnimationEnded( - LayerAnimationSequence* sequence) OVERRIDE; + LayerAnimationSequence* sequence) override; virtual void OnLayerAnimationAborted( - LayerAnimationSequence* sequence) OVERRIDE; + LayerAnimationSequence* sequence) override; virtual void OnLayerAnimationScheduled( - LayerAnimationSequence* sequence) OVERRIDE; + LayerAnimationSequence* sequence) override; virtual void OnAttachedToSequence( - LayerAnimationSequence* sequence) OVERRIDE; + LayerAnimationSequence* sequence) override; virtual void OnDetachedFromSequence( - LayerAnimationSequence* sequence) OVERRIDE; + LayerAnimationSequence* sequence) override; // OnImplicitAnimationsCompleted is not fired unless the observer is active. bool active() const { return active_; } diff --git a/ui/compositor/layer_animator_collection.h b/ui/compositor/layer_animator_collection.h index eef06fb..b7bfe2e 100644 --- a/ui/compositor/layer_animator_collection.h +++ b/ui/compositor/layer_animator_collection.h @@ -34,7 +34,7 @@ class COMPOSITOR_EXPORT LayerAnimatorCollection base::TimeTicks last_tick_time() const { return last_tick_time_; } // CompositorAnimationObserver: - virtual void OnAnimationStep(base::TimeTicks timestamp) OVERRIDE; + virtual void OnAnimationStep(base::TimeTicks timestamp) override; private: Compositor* compositor_; diff --git a/ui/compositor/layer_animator_unittest.cc b/ui/compositor/layer_animator_unittest.cc index c12647f..ad4ff61 100644 --- a/ui/compositor/layer_animator_unittest.cc +++ b/ui/compositor/layer_animator_unittest.cc @@ -80,11 +80,11 @@ class TestImplicitAnimationObserver : public ImplicitAnimationObserver { private: // ImplicitAnimationObserver implementation - virtual void OnImplicitAnimationsCompleted() OVERRIDE { + virtual void OnImplicitAnimationsCompleted() override { animations_completed_ = true; } - virtual bool RequiresNotificationWhenAnimatorDestroyed() const OVERRIDE { + virtual bool RequiresNotificationWhenAnimatorDestroyed() const override { return notify_when_animator_destructed_; } @@ -102,17 +102,17 @@ class DeletingLayerAnimationObserver : public LayerAnimationObserver { } virtual void OnLayerAnimationEnded( - LayerAnimationSequence* sequence) OVERRIDE { + LayerAnimationSequence* sequence) override { animator_->StopAnimating(); } virtual void OnLayerAnimationAborted( - LayerAnimationSequence* sequence) OVERRIDE { + LayerAnimationSequence* sequence) override { animator_->StopAnimating(); } virtual void OnLayerAnimationScheduled( - LayerAnimationSequence* sequence) OVERRIDE { + LayerAnimationSequence* sequence) override { } private: @@ -158,7 +158,7 @@ class TestLayerAnimator : public LayerAnimator { } virtual void ProgressAnimation(LayerAnimationSequence* sequence, - base::TimeTicks now) OVERRIDE { + base::TimeTicks now) override { EXPECT_TRUE(HasAnimation(sequence)); LayerAnimator::ProgressAnimation(sequence, now); } @@ -1948,7 +1948,7 @@ TEST(LayerAnimatorTest, CallbackDeletesAnimationInProgress) { max_width_(max_width) { } - virtual void SetBoundsFromAnimation(const gfx::Rect& bounds) OVERRIDE { + virtual void SetBoundsFromAnimation(const gfx::Rect& bounds) override { TestLayerAnimationDelegate::SetBoundsFromAnimation(bounds); if (bounds.width() > max_width_) animator_->StopAnimating(); @@ -2282,19 +2282,19 @@ public: // LayerAnimationObserver implementation. virtual void OnLayerAnimationEnded( - LayerAnimationSequence* sequence) OVERRIDE { + LayerAnimationSequence* sequence) override { if (delete_on_animation_ended_) delete this; } virtual void OnLayerAnimationAborted( - LayerAnimationSequence* sequence) OVERRIDE { + LayerAnimationSequence* sequence) override { if (delete_on_animation_aborted_) delete this; } virtual void OnLayerAnimationScheduled( - LayerAnimationSequence* sequence) OVERRIDE { + LayerAnimationSequence* sequence) override { if (delete_on_animation_scheduled_) delete this; } @@ -2508,7 +2508,7 @@ class CollectionLayerAnimationDelegate : public TestLayerAnimationDelegate { virtual ~CollectionLayerAnimationDelegate() {} // LayerAnimationDelegate: - virtual LayerAnimatorCollection* GetLayerAnimatorCollection() OVERRIDE { + virtual LayerAnimatorCollection* GetLayerAnimatorCollection() override { return &collection; } diff --git a/ui/compositor/layer_unittest.cc b/ui/compositor/layer_unittest.cc index ac534f8..f6b0eac 100644 --- a/ui/compositor/layer_unittest.cc +++ b/ui/compositor/layer_unittest.cc @@ -62,17 +62,17 @@ class ColoredLayer : public Layer, public LayerDelegate { virtual ~ColoredLayer() { } // Overridden from LayerDelegate: - virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE { + virtual void OnPaintLayer(gfx::Canvas* canvas) override { canvas->DrawColor(color_); } virtual void OnDelegatedFrameDamage( - const gfx::Rect& damage_rect_in_dip) OVERRIDE {} + const gfx::Rect& damage_rect_in_dip) override {} - virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE { + virtual void OnDeviceScaleFactorChanged(float device_scale_factor) override { } - virtual base::Closure PrepareForLayerBoundsChange() OVERRIDE { + virtual base::Closure PrepareForLayerBoundsChange() override { return base::Closure(); } @@ -92,7 +92,7 @@ class LayerWithRealCompositorTest : public testing::Test { virtual ~LayerWithRealCompositorTest() {} // Overridden from testing::Test: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { bool enable_pixel_output = true; ui::ContextFactory* context_factory = InitializeContextFactoryForTests(enable_pixel_output); @@ -103,7 +103,7 @@ class LayerWithRealCompositorTest : public testing::Test { compositor_host_->Show(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { compositor_host_.reset(); TerminateContextFactoryForTests(); } @@ -234,7 +234,7 @@ class TestLayerDelegate : public LayerDelegate { } // Overridden from LayerDelegate: - virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE { + virtual void OnPaintLayer(gfx::Canvas* canvas) override { SkISize size = canvas->sk_canvas()->getBaseLayerSize(); paint_size_ = gfx::Size(size.width(), size.height()); canvas->DrawColor(colors_[color_index_]); @@ -245,13 +245,13 @@ class TestLayerDelegate : public LayerDelegate { } virtual void OnDelegatedFrameDamage( - const gfx::Rect& damage_rect_in_dip) OVERRIDE {} + const gfx::Rect& damage_rect_in_dip) override {} - virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE { + virtual void OnDeviceScaleFactorChanged(float device_scale_factor) override { device_scale_factor_ = device_scale_factor; } - virtual base::Closure PrepareForLayerBoundsChange() OVERRIDE { + virtual base::Closure PrepareForLayerBoundsChange() override { return base::Closure(); } @@ -287,15 +287,15 @@ class DrawTreeLayerDelegate : public LayerDelegate { private: // Overridden from LayerDelegate: - virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE { + virtual void OnPaintLayer(gfx::Canvas* canvas) override { painted_ = true; canvas->DrawColor(SK_ColorTRANSPARENT); } virtual void OnDelegatedFrameDamage( - const gfx::Rect& damage_rect_in_dip) OVERRIDE {} - virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE { + const gfx::Rect& damage_rect_in_dip) override {} + virtual void OnDeviceScaleFactorChanged(float device_scale_factor) override { } - virtual base::Closure PrepareForLayerBoundsChange() OVERRIDE { + virtual base::Closure PrepareForLayerBoundsChange() override { return base::Closure(); } @@ -312,11 +312,11 @@ class NullLayerDelegate : public LayerDelegate { private: // Overridden from LayerDelegate: - virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE {} + virtual void OnPaintLayer(gfx::Canvas* canvas) override {} virtual void OnDelegatedFrameDamage( - const gfx::Rect& damage_rect_in_dip) OVERRIDE {} - virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE {} - virtual base::Closure PrepareForLayerBoundsChange() OVERRIDE { + const gfx::Rect& damage_rect_in_dip) override {} + virtual void OnDeviceScaleFactorChanged(float device_scale_factor) override {} + virtual base::Closure PrepareForLayerBoundsChange() override { return base::Closure(); } @@ -341,24 +341,24 @@ class TestCompositorObserver : public CompositorObserver { } private: - virtual void OnCompositingDidCommit(Compositor* compositor) OVERRIDE { + virtual void OnCompositingDidCommit(Compositor* compositor) override { committed_ = true; } virtual void OnCompositingStarted(Compositor* compositor, - base::TimeTicks start_time) OVERRIDE { + base::TimeTicks start_time) override { started_ = true; } - virtual void OnCompositingEnded(Compositor* compositor) OVERRIDE { + virtual void OnCompositingEnded(Compositor* compositor) override { ended_ = true; } - virtual void OnCompositingAborted(Compositor* compositor) OVERRIDE { + virtual void OnCompositingAborted(Compositor* compositor) override { aborted_ = true; } - virtual void OnCompositingLockStateChanged(Compositor* compositor) OVERRIDE { + virtual void OnCompositingLockStateChanged(Compositor* compositor) override { } bool committed_; @@ -406,7 +406,7 @@ class LayerWithDelegateTest : public testing::Test { virtual ~LayerWithDelegateTest() {} // Overridden from testing::Test: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { bool enable_pixel_output = false; ui::ContextFactory* context_factory = InitializeContextFactoryForTests(enable_pixel_output); @@ -417,7 +417,7 @@ class LayerWithDelegateTest : public testing::Test { compositor_host_->Show(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { compositor_host_.reset(); TerminateContextFactoryForTests(); } @@ -616,12 +616,12 @@ class LayerWithNullDelegateTest : public LayerWithDelegateTest { LayerWithNullDelegateTest() {} virtual ~LayerWithNullDelegateTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { LayerWithDelegateTest::SetUp(); default_layer_delegate_.reset(new NullLayerDelegate()); } - virtual Layer* CreateLayer(LayerType type) OVERRIDE { + virtual Layer* CreateLayer(LayerType type) override { Layer* layer = new Layer(type); layer->set_delegate(default_layer_delegate_.get()); return layer; @@ -639,7 +639,7 @@ class LayerWithNullDelegateTest : public LayerWithDelegateTest { return layer; } - virtual Layer* CreateNoTextureLayer(const gfx::Rect& bounds) OVERRIDE { + virtual Layer* CreateNoTextureLayer(const gfx::Rect& bounds) override { Layer* layer = CreateLayer(LAYER_NOT_DRAWN); layer->SetBounds(bounds); return layer; @@ -1205,7 +1205,7 @@ class SchedulePaintLayerDelegate : public LayerDelegate { private: // Overridden from LayerDelegate: - virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE { + virtual void OnPaintLayer(gfx::Canvas* canvas) override { paint_count_++; if (!schedule_paint_rect_.IsEmpty()) { layer_->SchedulePaint(schedule_paint_rect_); @@ -1217,12 +1217,12 @@ class SchedulePaintLayerDelegate : public LayerDelegate { } virtual void OnDelegatedFrameDamage( - const gfx::Rect& damage_rect_in_dip) OVERRIDE {} + const gfx::Rect& damage_rect_in_dip) override {} - virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE { + virtual void OnDeviceScaleFactorChanged(float device_scale_factor) override { } - virtual base::Closure PrepareForLayerBoundsChange() OVERRIDE { + virtual base::Closure PrepareForLayerBoundsChange() override { return base::Closure(); } @@ -1721,7 +1721,7 @@ class FrameDamageCheckingDelegate : public TestLayerDelegate { FrameDamageCheckingDelegate() : delegated_frame_damage_called_(false) {} virtual void OnDelegatedFrameDamage( - const gfx::Rect& damage_rect_in_dip) OVERRIDE { + const gfx::Rect& damage_rect_in_dip) override { delegated_frame_damage_called_ = true; delegated_frame_damage_rect_ = damage_rect_in_dip; } diff --git a/ui/compositor/scoped_layer_animation_settings.cc b/ui/compositor/scoped_layer_animation_settings.cc index 487f96a..462f537 100644 --- a/ui/compositor/scoped_layer_animation_settings.cc +++ b/ui/compositor/scoped_layer_animation_settings.cc @@ -34,10 +34,10 @@ class InvertingObserver : public ImplicitAnimationObserver { inverse_layers_.push_back(inverse_layer); } - virtual void OnImplicitAnimationsCompleted() OVERRIDE {} + virtual void OnImplicitAnimationsCompleted() override {} virtual void OnLayerAnimationScheduled( - LayerAnimationSequence* sequence) OVERRIDE { + LayerAnimationSequence* sequence) override { DCHECK(base_layer_ != NULL) << "Must set base layer with ScopedLayerAnimationSettings::" << "SetInverslyAnimatedBaseLayer"; diff --git a/ui/compositor/test/draw_waiter_for_test.h b/ui/compositor/test/draw_waiter_for_test.h index e1d63ff..78acd01 100644 --- a/ui/compositor/test/draw_waiter_for_test.h +++ b/ui/compositor/test/draw_waiter_for_test.h @@ -41,12 +41,12 @@ class DrawWaiterForTest : public CompositorObserver { void WaitImpl(Compositor* compositor); // CompositorObserver implementation. - virtual void OnCompositingDidCommit(Compositor* compositor) OVERRIDE; + virtual void OnCompositingDidCommit(Compositor* compositor) override; virtual void OnCompositingStarted(Compositor* compositor, - base::TimeTicks start_time) OVERRIDE; - virtual void OnCompositingEnded(Compositor* compositor) OVERRIDE; - virtual void OnCompositingAborted(Compositor* compositor) OVERRIDE; - virtual void OnCompositingLockStateChanged(Compositor* compositor) OVERRIDE; + base::TimeTicks start_time) override; + virtual void OnCompositingEnded(Compositor* compositor) override; + virtual void OnCompositingAborted(Compositor* compositor) override; + virtual void OnCompositingLockStateChanged(Compositor* compositor) override; scoped_ptr<base::RunLoop> wait_run_loop_; diff --git a/ui/compositor/test/in_process_context_factory.h b/ui/compositor/test/in_process_context_factory.h index 1179729..56f2d7e 100644 --- a/ui/compositor/test/in_process_context_factory.h +++ b/ui/compositor/test/in_process_context_factory.h @@ -27,19 +27,19 @@ class InProcessContextFactory : public ContextFactory { // ContextFactory implementation virtual scoped_ptr<cc::OutputSurface> CreateOutputSurface( Compositor* compositor, - bool software_fallback) OVERRIDE; + bool software_fallback) override; virtual scoped_refptr<Reflector> CreateReflector( Compositor* mirrored_compositor, - Layer* mirroring_layer) OVERRIDE; - virtual void RemoveReflector(scoped_refptr<Reflector> reflector) OVERRIDE; + Layer* mirroring_layer) override; + virtual void RemoveReflector(scoped_refptr<Reflector> reflector) override; virtual scoped_refptr<cc::ContextProvider> SharedMainThreadContextProvider() - OVERRIDE; - virtual void RemoveCompositor(Compositor* compositor) OVERRIDE; - virtual bool DoesCreateTestContexts() OVERRIDE; - virtual cc::SharedBitmapManager* GetSharedBitmapManager() OVERRIDE; - virtual base::MessageLoopProxy* GetCompositorMessageLoop() OVERRIDE; + override; + virtual void RemoveCompositor(Compositor* compositor) override; + virtual bool DoesCreateTestContexts() override; + virtual cc::SharedBitmapManager* GetSharedBitmapManager() override; + virtual base::MessageLoopProxy* GetCompositorMessageLoop() override; private: scoped_ptr<base::Thread> compositor_thread_; diff --git a/ui/compositor/test/test_compositor_host_mac.mm b/ui/compositor/test/test_compositor_host_mac.mm index c85f743..12a9766 100644 --- a/ui/compositor/test/test_compositor_host_mac.mm +++ b/ui/compositor/test/test_compositor_host_mac.mm @@ -88,8 +88,8 @@ class TestCompositorHostMac : public TestCompositorHost, private: // TestCompositorHost: - virtual void Show() OVERRIDE; - virtual ui::Compositor* GetCompositor() OVERRIDE; + virtual void Show() override; + virtual ui::Compositor* GetCompositor() override; gfx::Rect bounds_; diff --git a/ui/compositor/test/test_compositor_host_ozone.cc b/ui/compositor/test/test_compositor_host_ozone.cc index f520b4a..0d3861e 100644 --- a/ui/compositor/test/test_compositor_host_ozone.cc +++ b/ui/compositor/test/test_compositor_host_ozone.cc @@ -24,8 +24,8 @@ class TestCompositorHostOzone : public TestCompositorHost { private: // Overridden from TestCompositorHost: - virtual void Show() OVERRIDE; - virtual ui::Compositor* GetCompositor() OVERRIDE; + virtual void Show() override; + virtual ui::Compositor* GetCompositor() override; gfx::Rect bounds_; diff --git a/ui/compositor/test/test_compositor_host_win.cc b/ui/compositor/test/test_compositor_host_win.cc index a6278f6..e89d092 100644 --- a/ui/compositor/test/test_compositor_host_win.cc +++ b/ui/compositor/test/test_compositor_host_win.cc @@ -29,10 +29,10 @@ class TestCompositorHostWin : public TestCompositorHost, } // Overridden from TestCompositorHost: - virtual void Show() OVERRIDE { + virtual void Show() override { ShowWindow(hwnd(), SW_SHOWNORMAL); } - virtual ui::Compositor* GetCompositor() OVERRIDE { + virtual ui::Compositor* GetCompositor() override { return compositor_.get(); } diff --git a/ui/compositor/test/test_compositor_host_x11.cc b/ui/compositor/test/test_compositor_host_x11.cc index ff1097c..0ee6284 100644 --- a/ui/compositor/test/test_compositor_host_x11.cc +++ b/ui/compositor/test/test_compositor_host_x11.cc @@ -27,8 +27,8 @@ class TestCompositorHostX11 : public TestCompositorHost { private: // Overridden from TestCompositorHost: - virtual void Show() OVERRIDE; - virtual ui::Compositor* GetCompositor() OVERRIDE; + virtual void Show() override; + virtual ui::Compositor* GetCompositor() override; gfx::Rect bounds_; diff --git a/ui/compositor/test/test_layer_animation_delegate.h b/ui/compositor/test/test_layer_animation_delegate.h index 0732c99..3ccb108 100644 --- a/ui/compositor/test/test_layer_animation_delegate.h +++ b/ui/compositor/test/test_layer_animation_delegate.h @@ -19,27 +19,27 @@ class TestLayerAnimationDelegate : public LayerAnimationDelegate { virtual ~TestLayerAnimationDelegate(); // Implementation of LayerAnimationDelegate - virtual void SetBoundsFromAnimation(const gfx::Rect& bounds) OVERRIDE; + virtual void SetBoundsFromAnimation(const gfx::Rect& bounds) override; virtual void SetTransformFromAnimation( - const gfx::Transform& transform) OVERRIDE; - virtual void SetOpacityFromAnimation(float opacity) OVERRIDE; - virtual void SetVisibilityFromAnimation(bool visibility) OVERRIDE; - virtual void SetBrightnessFromAnimation(float brightness) OVERRIDE; - virtual void SetGrayscaleFromAnimation(float grayscale) OVERRIDE; - virtual void SetColorFromAnimation(SkColor color) OVERRIDE; - virtual void ScheduleDrawForAnimation() OVERRIDE; - virtual const gfx::Rect& GetBoundsForAnimation() const OVERRIDE; - virtual gfx::Transform GetTransformForAnimation() const OVERRIDE; - virtual float GetOpacityForAnimation() const OVERRIDE; - virtual bool GetVisibilityForAnimation() const OVERRIDE; - virtual float GetBrightnessForAnimation() const OVERRIDE; - virtual float GetGrayscaleForAnimation() const OVERRIDE; - virtual SkColor GetColorForAnimation() const OVERRIDE; - virtual float GetDeviceScaleFactor() const OVERRIDE; + const gfx::Transform& transform) override; + virtual void SetOpacityFromAnimation(float opacity) override; + virtual void SetVisibilityFromAnimation(bool visibility) override; + virtual void SetBrightnessFromAnimation(float brightness) override; + virtual void SetGrayscaleFromAnimation(float grayscale) override; + virtual void SetColorFromAnimation(SkColor color) override; + virtual void ScheduleDrawForAnimation() override; + virtual const gfx::Rect& GetBoundsForAnimation() const override; + virtual gfx::Transform GetTransformForAnimation() const override; + virtual float GetOpacityForAnimation() const override; + virtual bool GetVisibilityForAnimation() const override; + virtual float GetBrightnessForAnimation() const override; + virtual float GetGrayscaleForAnimation() const override; + virtual SkColor GetColorForAnimation() const override; + virtual float GetDeviceScaleFactor() const override; virtual void AddThreadedAnimation( - scoped_ptr<cc::Animation> animation) OVERRIDE; - virtual void RemoveThreadedAnimation(int animation_id) OVERRIDE; - virtual LayerAnimatorCollection* GetLayerAnimatorCollection() OVERRIDE; + scoped_ptr<cc::Animation> animation) override; + virtual void RemoveThreadedAnimation(int animation_id) override; + virtual LayerAnimatorCollection* GetLayerAnimatorCollection() override; private: gfx::Rect bounds_; diff --git a/ui/compositor/test/test_layer_animation_observer.h b/ui/compositor/test/test_layer_animation_observer.h index 52789f8..bfdcd28 100644 --- a/ui/compositor/test/test_layer_animation_observer.h +++ b/ui/compositor/test/test_layer_animation_observer.h @@ -20,15 +20,15 @@ class TestLayerAnimationObserver : public LayerAnimationObserver { virtual ~TestLayerAnimationObserver(); virtual void OnLayerAnimationEnded( - LayerAnimationSequence* sequence) OVERRIDE; + LayerAnimationSequence* sequence) override; virtual void OnLayerAnimationAborted( - LayerAnimationSequence* sequence) OVERRIDE; + LayerAnimationSequence* sequence) override; virtual void OnLayerAnimationScheduled( - LayerAnimationSequence* sequence) OVERRIDE; + LayerAnimationSequence* sequence) override; - virtual bool RequiresNotificationWhenAnimatorDestroyed() const OVERRIDE; + virtual bool RequiresNotificationWhenAnimatorDestroyed() const override; const LayerAnimationSequence* last_ended_sequence() const { return last_ended_sequence_; diff --git a/ui/compositor/test/test_suite.h b/ui/compositor/test/test_suite.h index 2d86fdc..3daf439 100644 --- a/ui/compositor/test/test_suite.h +++ b/ui/compositor/test/test_suite.h @@ -24,8 +24,8 @@ class CompositorTestSuite : public base::TestSuite { protected: // Overridden from base::TestSuite: - virtual void Initialize() OVERRIDE; - virtual void Shutdown() OVERRIDE; + virtual void Initialize() override; + virtual void Shutdown() override; private: scoped_ptr<base::MessageLoop> message_loop_; diff --git a/ui/compositor/transform_animation_curve_adapter.h b/ui/compositor/transform_animation_curve_adapter.h index c410ac0..43952ca 100644 --- a/ui/compositor/transform_animation_curve_adapter.h +++ b/ui/compositor/transform_animation_curve_adapter.h @@ -25,14 +25,14 @@ class COMPOSITOR_EXPORT TransformAnimationCurveAdapter virtual ~TransformAnimationCurveAdapter(); // TransformAnimationCurve implementation. - virtual double Duration() const OVERRIDE; - virtual scoped_ptr<AnimationCurve> Clone() const OVERRIDE; - virtual gfx::Transform GetValue(double t) const OVERRIDE; + virtual double Duration() const override; + virtual scoped_ptr<AnimationCurve> Clone() const override; + virtual gfx::Transform GetValue(double t) const override; virtual bool AnimatedBoundsForBox(const gfx::BoxF& box, - gfx::BoxF* bounds) const OVERRIDE; - virtual bool AffectsScale() const OVERRIDE; - virtual bool IsTranslation() const OVERRIDE; - virtual bool MaximumScale(float* max_scale) const OVERRIDE; + gfx::BoxF* bounds) const override; + virtual bool AffectsScale() const override; + virtual bool IsTranslation() const override; + virtual bool MaximumScale(float* max_scale) const override; private: gfx::Tween::Type tween_type_; @@ -54,14 +54,14 @@ class COMPOSITOR_EXPORT InverseTransformCurveAdapter virtual ~InverseTransformCurveAdapter(); - virtual double Duration() const OVERRIDE; - virtual scoped_ptr<AnimationCurve> Clone() const OVERRIDE; - virtual gfx::Transform GetValue(double t) const OVERRIDE; + virtual double Duration() const override; + virtual scoped_ptr<AnimationCurve> Clone() const override; + virtual gfx::Transform GetValue(double t) const override; virtual bool AnimatedBoundsForBox(const gfx::BoxF& box, - gfx::BoxF* bounds) const OVERRIDE; - virtual bool AffectsScale() const OVERRIDE; - virtual bool IsTranslation() const OVERRIDE; - virtual bool MaximumScale(float* max_scale) const OVERRIDE; + gfx::BoxF* bounds) const override; + virtual bool AffectsScale() const override; + virtual bool IsTranslation() const override; + virtual bool MaximumScale(float* max_scale) const override; private: TransformAnimationCurveAdapter base_curve_; diff --git a/ui/display/chromeos/display_configurator.h b/ui/display/chromeos/display_configurator.h index bd0576c..bbc7b53 100644 --- a/ui/display/chromeos/display_configurator.h +++ b/ui/display/chromeos/display_configurator.h @@ -186,7 +186,7 @@ class DISPLAY_EXPORT DisplayConfigurator : public NativeDisplayObserver { bool SetDisplayMode(MultipleDisplayState new_state); // NativeDisplayDelegate::Observer overrides: - virtual void OnConfigurationChanged() OVERRIDE; + virtual void OnConfigurationChanged() override; void AddObserver(Observer* observer); void RemoveObserver(Observer* observer); diff --git a/ui/display/chromeos/display_configurator_unittest.cc b/ui/display/chromeos/display_configurator_unittest.cc index 79cfd7b..7ecb145 100644 --- a/ui/display/chromeos/display_configurator_unittest.cc +++ b/ui/display/chromeos/display_configurator_unittest.cc @@ -154,24 +154,24 @@ class TestNativeDisplayDelegate : public NativeDisplayDelegate { void set_hdcp_state(HDCPState state) { hdcp_state_ = state; } // DisplayConfigurator::Delegate overrides: - virtual void Initialize() OVERRIDE { log_->AppendAction(kInitXRandR); } - virtual void GrabServer() OVERRIDE { log_->AppendAction(kGrab); } - virtual void UngrabServer() OVERRIDE { log_->AppendAction(kUngrab); } - virtual void SyncWithServer() OVERRIDE { log_->AppendAction(kSync); } - virtual void SetBackgroundColor(uint32_t color_argb) OVERRIDE { + virtual void Initialize() override { log_->AppendAction(kInitXRandR); } + virtual void GrabServer() override { log_->AppendAction(kGrab); } + virtual void UngrabServer() override { log_->AppendAction(kUngrab); } + virtual void SyncWithServer() override { log_->AppendAction(kSync); } + virtual void SetBackgroundColor(uint32_t color_argb) override { log_->AppendAction(GetBackgroundAction(color_argb)); } - virtual void ForceDPMSOn() OVERRIDE { log_->AppendAction(kForceDPMS); } - virtual std::vector<DisplaySnapshot*> GetDisplays() OVERRIDE { + virtual void ForceDPMSOn() override { log_->AppendAction(kForceDPMS); } + virtual std::vector<DisplaySnapshot*> GetDisplays() override { return outputs_; } virtual void AddMode(const DisplaySnapshot& output, - const DisplayMode* mode) OVERRIDE { + const DisplayMode* mode) override { log_->AppendAction(GetAddOutputModeAction(output, mode)); } virtual bool Configure(const DisplaySnapshot& output, const DisplayMode* mode, - const gfx::Point& origin) OVERRIDE { + const gfx::Point& origin) override { log_->AppendAction(GetCrtcAction(output, mode, origin)); if (max_configurable_pixels_ == 0) @@ -182,38 +182,38 @@ class TestNativeDisplayDelegate : public NativeDisplayDelegate { return mode->size().GetArea() <= max_configurable_pixels_; } - virtual void CreateFrameBuffer(const gfx::Size& size) OVERRIDE { + virtual void CreateFrameBuffer(const gfx::Size& size) override { log_->AppendAction( GetFramebufferAction(size, outputs_.size() >= 1 ? outputs_[0] : NULL, outputs_.size() >= 2 ? outputs_[1] : NULL)); } virtual bool GetHDCPState(const DisplaySnapshot& output, - HDCPState* state) OVERRIDE { + HDCPState* state) override { *state = hdcp_state_; return true; } virtual bool SetHDCPState(const DisplaySnapshot& output, - HDCPState state) OVERRIDE { + HDCPState state) override { log_->AppendAction(GetSetHDCPStateAction(output, state)); return true; } virtual std::vector<ui::ColorCalibrationProfile> - GetAvailableColorCalibrationProfiles(const DisplaySnapshot& output) OVERRIDE { + GetAvailableColorCalibrationProfiles(const DisplaySnapshot& output) override { return std::vector<ui::ColorCalibrationProfile>(); } virtual bool SetColorCalibrationProfile( const DisplaySnapshot& output, - ui::ColorCalibrationProfile new_profile) OVERRIDE { + ui::ColorCalibrationProfile new_profile) override { return false; } - virtual void AddObserver(NativeDisplayObserver* observer) OVERRIDE {} + virtual void AddObserver(NativeDisplayObserver* observer) override {} - virtual void RemoveObserver(NativeDisplayObserver* observer) OVERRIDE {} + virtual void RemoveObserver(NativeDisplayObserver* observer) override {} private: // Outputs to be returned by GetDisplays(). @@ -262,13 +262,13 @@ class TestObserver : public DisplayConfigurator::Observer { // DisplayConfigurator::Observer overrides: virtual void OnDisplayModeChanged( - const DisplayConfigurator::DisplayStateList& outputs) OVERRIDE { + const DisplayConfigurator::DisplayStateList& outputs) override { num_changes_++; latest_outputs_ = outputs; } virtual void OnDisplayModeChangeFailed(MultipleDisplayState failed_new_state) - OVERRIDE { + override { num_failures_++; latest_failed_state_ = failed_new_state; } @@ -296,11 +296,11 @@ class TestStateController : public DisplayConfigurator::StateController { // DisplayConfigurator::StateController overrides: virtual MultipleDisplayState GetStateForDisplayIds( - const std::vector<int64_t>& outputs) const OVERRIDE { + const std::vector<int64_t>& outputs) const override { return state_; } virtual bool GetResolutionForDisplayId(int64_t display_id, - gfx::Size* size) const OVERRIDE { + gfx::Size* size) const override { return false; } @@ -316,11 +316,11 @@ class TestMirroringController TestMirroringController() : software_mirroring_enabled_(false) {} virtual ~TestMirroringController() {} - virtual void SetSoftwareMirroring(bool enabled) OVERRIDE { + virtual void SetSoftwareMirroring(bool enabled) override { software_mirroring_enabled_ = enabled; } - virtual bool SoftwareMirroringEnabled() const OVERRIDE { + virtual bool SoftwareMirroringEnabled() const override { return software_mirroring_enabled_; } @@ -339,7 +339,7 @@ class DisplayConfiguratorTest : public testing::Test { test_api_(&configurator_) {} virtual ~DisplayConfiguratorTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { log_.reset(new ActionLogger()); native_display_delegate_ = new TestNativeDisplayDelegate(log_.get()); diff --git a/ui/display/chromeos/test/test_display_snapshot.h b/ui/display/chromeos/test/test_display_snapshot.h index 3d52f79..95653ca 100644 --- a/ui/display/chromeos/test/test_display_snapshot.h +++ b/ui/display/chromeos/test/test_display_snapshot.h @@ -39,7 +39,7 @@ class DISPLAY_EXPORT TestDisplaySnapshot : public DisplaySnapshot { } // DisplaySnapshot overrides: - virtual std::string ToString() const OVERRIDE; + virtual std::string ToString() const override; private: DISALLOW_COPY_AND_ASSIGN(TestDisplaySnapshot); diff --git a/ui/display/chromeos/x11/display_snapshot_x11.h b/ui/display/chromeos/x11/display_snapshot_x11.h index 01a44c6..50128b4 100644 --- a/ui/display/chromeos/x11/display_snapshot_x11.h +++ b/ui/display/chromeos/x11/display_snapshot_x11.h @@ -38,7 +38,7 @@ class DISPLAY_EXPORT DisplaySnapshotX11 : public DisplaySnapshot { int index() const { return index_; } // DisplaySnapshot overrides: - virtual std::string ToString() const OVERRIDE; + virtual std::string ToString() const override; private: RROutput output_; diff --git a/ui/display/chromeos/x11/native_display_delegate_x11.cc b/ui/display/chromeos/x11/native_display_delegate_x11.cc index 6959f46..50dc322 100644 --- a/ui/display/chromeos/x11/native_display_delegate_x11.cc +++ b/ui/display/chromeos/x11/native_display_delegate_x11.cc @@ -83,14 +83,14 @@ class NativeDisplayDelegateX11::HelperDelegateX11 // NativeDisplayDelegateX11::HelperDelegate overrides: virtual void UpdateXRandRConfiguration(const base::NativeEvent& event) - OVERRIDE { + override { XRRUpdateConfiguration(event); } virtual const std::vector<DisplaySnapshot*>& GetCachedDisplays() const - OVERRIDE { + override { return delegate_->cached_outputs_.get(); } - virtual void NotifyDisplayObservers() OVERRIDE { + virtual void NotifyDisplayObservers() override { FOR_EACH_OBSERVER( NativeDisplayObserver, delegate_->observers_, OnConfigurationChanged()); } diff --git a/ui/display/chromeos/x11/native_display_delegate_x11.h b/ui/display/chromeos/x11/native_display_delegate_x11.h index d349843..4208d38 100644 --- a/ui/display/chromeos/x11/native_display_delegate_x11.h +++ b/ui/display/chromeos/x11/native_display_delegate_x11.h @@ -68,31 +68,31 @@ class DISPLAY_EXPORT NativeDisplayDelegateX11 : public NativeDisplayDelegate { virtual ~NativeDisplayDelegateX11(); // NativeDisplayDelegate overrides: - virtual void Initialize() OVERRIDE; - virtual void GrabServer() OVERRIDE; - virtual void UngrabServer() OVERRIDE; - virtual void SyncWithServer() OVERRIDE; - virtual void SetBackgroundColor(uint32_t color_argb) OVERRIDE; - virtual void ForceDPMSOn() OVERRIDE; - virtual std::vector<DisplaySnapshot*> GetDisplays() OVERRIDE; + virtual void Initialize() override; + virtual void GrabServer() override; + virtual void UngrabServer() override; + virtual void SyncWithServer() override; + virtual void SetBackgroundColor(uint32_t color_argb) override; + virtual void ForceDPMSOn() override; + virtual std::vector<DisplaySnapshot*> GetDisplays() override; virtual void AddMode(const DisplaySnapshot& output, - const DisplayMode* mode) OVERRIDE; + const DisplayMode* mode) override; virtual bool Configure(const DisplaySnapshot& output, const DisplayMode* mode, - const gfx::Point& origin) OVERRIDE; - virtual void CreateFrameBuffer(const gfx::Size& size) OVERRIDE; + const gfx::Point& origin) override; + virtual void CreateFrameBuffer(const gfx::Size& size) override; virtual bool GetHDCPState(const DisplaySnapshot& output, - HDCPState* state) OVERRIDE; + HDCPState* state) override; virtual bool SetHDCPState(const DisplaySnapshot& output, - HDCPState state) OVERRIDE; + HDCPState state) override; virtual std::vector<ColorCalibrationProfile> GetAvailableColorCalibrationProfiles( - const DisplaySnapshot& output) OVERRIDE; + const DisplaySnapshot& output) override; virtual bool SetColorCalibrationProfile( const DisplaySnapshot& output, - ColorCalibrationProfile new_profile) OVERRIDE; - virtual void AddObserver(NativeDisplayObserver* observer) OVERRIDE; - virtual void RemoveObserver(NativeDisplayObserver* observer) OVERRIDE; + ColorCalibrationProfile new_profile) override; + virtual void AddObserver(NativeDisplayObserver* observer) override; + virtual void RemoveObserver(NativeDisplayObserver* observer) override; private: class HelperDelegateX11; diff --git a/ui/display/chromeos/x11/native_display_event_dispatcher_x11.h b/ui/display/chromeos/x11/native_display_event_dispatcher_x11.h index e490074..e3ff9c0 100644 --- a/ui/display/chromeos/x11/native_display_event_dispatcher_x11.h +++ b/ui/display/chromeos/x11/native_display_event_dispatcher_x11.h @@ -25,8 +25,8 @@ class DISPLAY_EXPORT NativeDisplayEventDispatcherX11 virtual ~NativeDisplayEventDispatcherX11(); // ui::PlatformEventDispatcher: - virtual bool CanDispatchEvent(const PlatformEvent& event) OVERRIDE; - virtual uint32_t DispatchEvent(const PlatformEvent& event) OVERRIDE; + virtual bool CanDispatchEvent(const PlatformEvent& event) override; + virtual uint32_t DispatchEvent(const PlatformEvent& event) override; void SetTickClockForTest(scoped_ptr<base::TickClock> tick_clock); diff --git a/ui/display/chromeos/x11/native_display_event_dispatcher_x11_unittest.cc b/ui/display/chromeos/x11/native_display_event_dispatcher_x11_unittest.cc index d7cf589..45bca9f 100644 --- a/ui/display/chromeos/x11/native_display_event_dispatcher_x11_unittest.cc +++ b/ui/display/chromeos/x11/native_display_event_dispatcher_x11_unittest.cc @@ -58,10 +58,10 @@ class TestHelperDelegate : public NativeDisplayDelegateX11::HelperDelegate { // NativeDisplayDelegateX11::HelperDelegate overrides: virtual void UpdateXRandRConfiguration(const base::NativeEvent& event) - OVERRIDE; + override; virtual const std::vector<DisplaySnapshot*>& GetCachedDisplays() const - OVERRIDE; - virtual void NotifyDisplayObservers() OVERRIDE; + override; + virtual void NotifyDisplayObservers() override; private: int num_calls_update_xrandr_config_; diff --git a/ui/events/device_data_manager.h b/ui/events/device_data_manager.h index aae8272..54c139b 100644 --- a/ui/events/device_data_manager.h +++ b/ui/events/device_data_manager.h @@ -61,7 +61,7 @@ class EVENTS_BASE_EXPORT DeviceDataManager : public DeviceHotplugEventObserver { // DeviceHotplugEventObserver: virtual void OnTouchscreenDevicesUpdated( - const std::vector<TouchscreenDevice>& devices) OVERRIDE; + const std::vector<TouchscreenDevice>& devices) override; double touch_radius_scale_map_[kMaxDeviceNum]; diff --git a/ui/events/event.h b/ui/events/event.h index 8f2c79a..e970826 100644 --- a/ui/events/event.h +++ b/ui/events/event.h @@ -470,7 +470,7 @@ class EVENTS_EXPORT MouseWheelEvent : public MouseEvent { // Overridden from LocatedEvent. virtual void UpdateForRootTransform( - const gfx::Transform& inverted_root_transform) OVERRIDE; + const gfx::Transform& inverted_root_transform) override; private: gfx::Vector2d offset_; @@ -522,7 +522,7 @@ class EVENTS_EXPORT TouchEvent : public LocatedEvent { // Overridden from LocatedEvent. virtual void UpdateForRootTransform( - const gfx::Transform& inverted_root_transform) OVERRIDE; + const gfx::Transform& inverted_root_transform) override; protected: void set_radius(float radius_x, float radius_y) { diff --git a/ui/events/event_dispatcher_unittest.cc b/ui/events/event_dispatcher_unittest.cc index 248784a..415add7 100644 --- a/ui/events/event_dispatcher_unittest.cc +++ b/ui/events/event_dispatcher_unittest.cc @@ -38,19 +38,19 @@ class TestTarget : public EventTarget { private: // Overridden from EventTarget: - virtual bool CanAcceptEvent(const ui::Event& event) OVERRIDE { + virtual bool CanAcceptEvent(const ui::Event& event) override { return true; } - virtual EventTarget* GetParentTarget() OVERRIDE { + virtual EventTarget* GetParentTarget() override { return parent_; } - virtual scoped_ptr<EventTargetIterator> GetChildIterator() const OVERRIDE { + virtual scoped_ptr<EventTargetIterator> GetChildIterator() const override { return scoped_ptr<EventTargetIterator>(); } - virtual EventTargeter* GetEventTargeter() OVERRIDE { + virtual EventTargeter* GetEventTargeter() override { return NULL; } @@ -94,7 +94,7 @@ class TestEventHandler : public EventHandler { private: // Overridden from EventHandler: - virtual void OnEvent(Event* event) OVERRIDE { + virtual void OnEvent(Event* event) override { ui::EventHandler::OnEvent(event); ReceivedEvent(event); SetStatusOnEvent(event); @@ -141,7 +141,7 @@ class EventHandlerDestroyDispatcherDelegate : public TestEventHandler { virtual ~EventHandlerDestroyDispatcherDelegate() {} private: - virtual void ReceivedEvent(Event* event) OVERRIDE { + virtual void ReceivedEvent(Event* event) override { TestEventHandler::ReceivedEvent(event); delete dispatcher_delegate_; } @@ -158,7 +158,7 @@ class InvalidateTargetEventHandler : public TestEventHandler { virtual ~InvalidateTargetEventHandler() {} private: - virtual void ReceivedEvent(Event* event) OVERRIDE { + virtual void ReceivedEvent(Event* event) override { TestEventHandler::ReceivedEvent(event); TestTarget* target = static_cast<TestTarget*>(event->target()); target->set_valid(false); @@ -186,7 +186,7 @@ class EventHandlerDestroyer : public TestEventHandler { } private: - virtual void ReceivedEvent(Event* event) OVERRIDE { + virtual void ReceivedEvent(Event* event) override { TestEventHandler::ReceivedEvent(event); delete to_destroy_; to_destroy_ = NULL; @@ -215,7 +215,7 @@ class TestEventDispatcher : public EventDispatcherDelegate { private: // Overridden from EventDispatcherDelegate: - virtual bool CanDispatchToTarget(EventTarget* target) OVERRIDE { + virtual bool CanDispatchToTarget(EventTarget* target) override { TestTarget* test_target = static_cast<TestTarget*>(target); return test_target->valid(); } diff --git a/ui/events/event_processor_unittest.cc b/ui/events/event_processor_unittest.cc index d6720a8..33a8162 100644 --- a/ui/events/event_processor_unittest.cc +++ b/ui/events/event_processor_unittest.cc @@ -23,7 +23,7 @@ class EventProcessorTest : public testing::Test { virtual ~EventProcessorTest() {} // testing::Test: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { processor_.SetRoot(scoped_ptr<EventTarget>(new TestEventTarget())); processor_.Reset(); root()->SetEventTargeter(make_scoped_ptr(new EventTargeter())); @@ -69,7 +69,7 @@ class BoundsEventTargeter : public EventTargeter { protected: virtual bool SubtreeShouldBeExploredForEvent( - EventTarget* target, const LocatedEvent& event) OVERRIDE { + EventTarget* target, const LocatedEvent& event) override { T* t = static_cast<T*>(target); return (t->bounds().Contains(event.location())); } @@ -107,7 +107,7 @@ class BoundsTestTarget : public TestEventTarget { private: // EventTarget: virtual void ConvertEventToTarget(EventTarget* target, - LocatedEvent* event) OVERRIDE { + LocatedEvent* event) override { event->ConvertLocationToTarget(this, static_cast<BoundsTestTarget*>(target)); } @@ -185,7 +185,7 @@ class ReDispatchEventHandler : public TestEventHandler { virtual ~ReDispatchEventHandler() {} // TestEventHandler: - virtual void OnMouseEvent(MouseEvent* event) OVERRIDE { + virtual void OnMouseEvent(MouseEvent* event) override { TestEventHandler::OnMouseEvent(event); EXPECT_EQ(expected_target_, event->target()); @@ -327,7 +327,7 @@ class IgnoreEventTargeter : public EventTargeter { private: // EventTargeter: virtual bool SubtreeShouldBeExploredForEvent( - EventTarget* target, const LocatedEvent& event) OVERRIDE { + EventTarget* target, const LocatedEvent& event) override { return false; } }; @@ -369,12 +369,12 @@ class BubblingEventTargeter : public EventTargeter { private: // EventTargeter: virtual EventTarget* FindTargetForEvent(EventTarget* root, - Event* event) OVERRIDE { + Event* event) override { return initial_target_; } virtual EventTarget* FindNextBestTarget(EventTarget* previous_target, - Event* event) OVERRIDE { + Event* event) override { return previous_target->GetParentTarget(); } diff --git a/ui/events/event_rewriter_unittest.cc b/ui/events/event_rewriter_unittest.cc index 11a05c9..08e592f 100644 --- a/ui/events/event_rewriter_unittest.cc +++ b/ui/events/event_rewriter_unittest.cc @@ -45,7 +45,7 @@ class TestEventRewriteProcessor : public test::TestEventProcessor { void CheckAllReceived() { EXPECT_TRUE(expected_events_.empty()); } // EventProcessor: - virtual EventDispatchDetails OnEventFromSource(Event* event) OVERRIDE { + virtual EventDispatchDetails OnEventFromSource(Event* event) override { EXPECT_FALSE(expected_events_.empty()); EXPECT_EQ(expected_events_.front(), event->type()); expected_events_.pop_front(); @@ -62,7 +62,7 @@ class TestEventRewriteSource : public EventSource { public: explicit TestEventRewriteSource(EventProcessor* processor) : processor_(processor) {} - virtual EventProcessor* GetEventProcessor() OVERRIDE { return processor_; } + virtual EventProcessor* GetEventProcessor() override { return processor_; } void Send(EventType type) { scoped_ptr<Event> event(new TestEvent(type)); (void)SendEventToProcessor(event.get()); @@ -85,14 +85,14 @@ class TestConstantEventRewriter : public EventRewriter { virtual EventRewriteStatus RewriteEvent(const Event& event, scoped_ptr<Event>* rewritten_event) - OVERRIDE { + override { if (status_ == EVENT_REWRITE_REWRITTEN) rewritten_event->reset(new TestEvent(type_)); return status_; } virtual EventRewriteStatus NextDispatchEvent(const Event& last_event, scoped_ptr<Event>* new_event) - OVERRIDE { + override { NOTREACHED(); return status_; } @@ -115,7 +115,7 @@ class TestStateMachineEventRewriter : public EventRewriter { } virtual EventRewriteStatus RewriteEvent(const Event& event, scoped_ptr<Event>* rewritten_event) - OVERRIDE { + override { RewriteRules::iterator find = rules_.find(RewriteCase(state_, event.type())); if (find == rules_.end()) @@ -132,7 +132,7 @@ class TestStateMachineEventRewriter : public EventRewriter { } virtual EventRewriteStatus NextDispatchEvent(const Event& last_event, scoped_ptr<Event>* new_event) - OVERRIDE { + override { EXPECT_TRUE(last_rewritten_event_); const TestEvent* arg_last = static_cast<const TestEvent*>(&last_event); EXPECT_EQ(last_rewritten_event_->unique_id(), arg_last->unique_id()); diff --git a/ui/events/event_target.h b/ui/events/event_target.h index 3ffec55..cf8ff8a 100644 --- a/ui/events/event_target.h +++ b/ui/events/event_target.h @@ -85,12 +85,12 @@ class EVENTS_EXPORT EventTarget : public EventHandler { EventHandler* target_handler() { return target_handler_; } // Overridden from EventHandler: - virtual void OnEvent(Event* event) OVERRIDE; - virtual void OnKeyEvent(KeyEvent* event) OVERRIDE; - virtual void OnMouseEvent(MouseEvent* event) OVERRIDE; - virtual void OnScrollEvent(ScrollEvent* event) OVERRIDE; - virtual void OnTouchEvent(TouchEvent* event) OVERRIDE; - virtual void OnGestureEvent(GestureEvent* event) OVERRIDE; + virtual void OnEvent(Event* event) override; + virtual void OnKeyEvent(KeyEvent* event) override; + virtual void OnMouseEvent(MouseEvent* event) override; + virtual void OnScrollEvent(ScrollEvent* event) override; + virtual void OnTouchEvent(TouchEvent* event) override; + virtual void OnGestureEvent(GestureEvent* event) override; private: friend class EventDispatcher; diff --git a/ui/events/event_target_iterator.h b/ui/events/event_target_iterator.h index 3083c83..28b4a30 100644 --- a/ui/events/event_target_iterator.h +++ b/ui/events/event_target_iterator.h @@ -30,7 +30,7 @@ class EventTargetIteratorImpl : public EventTargetIterator { } virtual ~EventTargetIteratorImpl() {} - virtual EventTarget* GetNextTarget() OVERRIDE { + virtual EventTarget* GetNextTarget() override { if (begin_ == end_) return NULL; EventTarget* target = *(begin_); diff --git a/ui/events/gesture_detection/filtered_gesture_provider.h b/ui/events/gesture_detection/filtered_gesture_provider.h index 4d63be64..a2ac7fc 100644 --- a/ui/events/gesture_detection/filtered_gesture_provider.h +++ b/ui/events/gesture_detection/filtered_gesture_provider.h @@ -40,10 +40,10 @@ class GESTURE_DETECTION_EXPORT FilteredGestureProvider private: // GestureProviderClient implementation. - virtual void OnGestureEvent(const ui::GestureEventData& event) OVERRIDE; + virtual void OnGestureEvent(const ui::GestureEventData& event) override; // TouchDispositionGestureFilterClient implementation. - virtual void ForwardGestureEvent(const ui::GestureEventData& event) OVERRIDE; + virtual void ForwardGestureEvent(const ui::GestureEventData& event) override; GestureProviderClient* const client_; diff --git a/ui/events/gesture_detection/gesture_provider.cc b/ui/events/gesture_detection/gesture_provider.cc index 51d119b..6925c6c 100644 --- a/ui/events/gesture_detection/gesture_provider.cc +++ b/ui/events/gesture_detection/gesture_provider.cc @@ -195,21 +195,21 @@ class GestureProvider::GestureListenerImpl : public ScaleGestureListener, // ScaleGestureListener implementation. virtual bool OnScaleBegin(const ScaleGestureDetector& detector, - const MotionEvent& e) OVERRIDE { + const MotionEvent& e) override { if (ignore_multitouch_zoom_events_ && !detector.InDoubleTapMode()) return false; return true; } virtual void OnScaleEnd(const ScaleGestureDetector& detector, - const MotionEvent& e) OVERRIDE { + const MotionEvent& e) override { if (!pinch_event_sent_) return; Send(CreateGesture(ET_GESTURE_PINCH_END, e)); } virtual bool OnScale(const ScaleGestureDetector& detector, - const MotionEvent& e) OVERRIDE { + const MotionEvent& e) override { if (ignore_multitouch_zoom_events_ && !detector.InDoubleTapMode()) return false; if (!pinch_event_sent_) { @@ -264,7 +264,7 @@ class GestureProvider::GestureListenerImpl : public ScaleGestureListener, } // GestureListener implementation. - virtual bool OnDown(const MotionEvent& e) OVERRIDE { + virtual bool OnDown(const MotionEvent& e) override { GestureEventDetails tap_details(ET_GESTURE_TAP_DOWN); Send(CreateGesture(tap_details, e)); @@ -275,7 +275,7 @@ class GestureProvider::GestureListenerImpl : public ScaleGestureListener, virtual bool OnScroll(const MotionEvent& e1, const MotionEvent& e2, float raw_distance_x, - float raw_distance_y) OVERRIDE { + float raw_distance_y) override { float distance_x = raw_distance_x; float distance_y = raw_distance_y; if (!scroll_event_sent_) { @@ -348,7 +348,7 @@ class GestureProvider::GestureListenerImpl : public ScaleGestureListener, virtual bool OnFling(const MotionEvent& e1, const MotionEvent& e2, float velocity_x, - float velocity_y) OVERRIDE { + float velocity_y) override { if (snap_scroll_controller_.IsSnappingScrolls()) { if (snap_scroll_controller_.IsSnapHorizontal()) { velocity_y = 0; @@ -378,14 +378,14 @@ class GestureProvider::GestureListenerImpl : public ScaleGestureListener, virtual bool OnSwipe(const MotionEvent& e1, const MotionEvent& e2, float velocity_x, - float velocity_y) OVERRIDE { + float velocity_y) override { GestureEventDetails swipe_details(ET_GESTURE_SWIPE, velocity_x, velocity_y); Send(CreateGesture(swipe_details, e2)); return true; } virtual bool OnTwoFingerTap(const MotionEvent& e1, - const MotionEvent& e2) OVERRIDE { + const MotionEvent& e2) override { // The location of the two finger tap event should be the location of the // primary pointer. GestureEventDetails two_finger_tap_details( @@ -404,13 +404,13 @@ class GestureProvider::GestureListenerImpl : public ScaleGestureListener, return true; } - virtual void OnShowPress(const MotionEvent& e) OVERRIDE { + virtual void OnShowPress(const MotionEvent& e) override { GestureEventDetails show_press_details(ET_GESTURE_SHOW_PRESS); show_press_event_sent_ = true; Send(CreateGesture(show_press_details, e)); } - virtual bool OnSingleTapUp(const MotionEvent& e) OVERRIDE { + virtual bool OnSingleTapUp(const MotionEvent& e) override { // This is a hack to address the issue where user hovers // over a link for longer than double_tap_timeout_, then // OnSingleTapConfirmed() is not triggered. But we still @@ -444,7 +444,7 @@ class GestureProvider::GestureListenerImpl : public ScaleGestureListener, } // DoubleTapListener implementation. - virtual bool OnSingleTapConfirmed(const MotionEvent& e) OVERRIDE { + virtual bool OnSingleTapConfirmed(const MotionEvent& e) override { // Long taps in the edges of the screen have their events delayed by // ContentViewHolder for tab swipe operations. As a consequence of the delay // this method might be called after receiving the up event. @@ -458,11 +458,11 @@ class GestureProvider::GestureListenerImpl : public ScaleGestureListener, return true; } - virtual bool OnDoubleTap(const MotionEvent& e) OVERRIDE { + virtual bool OnDoubleTap(const MotionEvent& e) override { return scale_gesture_detector_.OnDoubleTap(e); } - virtual bool OnDoubleTapEvent(const MotionEvent& e) OVERRIDE { + virtual bool OnDoubleTapEvent(const MotionEvent& e) override { switch (e.GetAction()) { case MotionEvent::ACTION_DOWN: gesture_detector_.set_longpress_enabled(false); @@ -481,7 +481,7 @@ class GestureProvider::GestureListenerImpl : public ScaleGestureListener, return false; } - virtual void OnLongPress(const MotionEvent& e) OVERRIDE { + virtual void OnLongPress(const MotionEvent& e) override { DCHECK(!IsDoubleTapInProgress()); SetIgnoreSingleTap(true); GestureEventDetails long_press_details(ET_GESTURE_LONG_PRESS); diff --git a/ui/events/gesture_detection/gesture_provider_unittest.cc b/ui/events/gesture_detection/gesture_provider_unittest.cc index a25a0b5..da305ff 100644 --- a/ui/events/gesture_detection/gesture_provider_unittest.cc +++ b/ui/events/gesture_detection/gesture_provider_unittest.cc @@ -123,15 +123,15 @@ class GestureProviderTest : public testing::Test, public GestureProviderClient { } // Test - virtual void SetUp() OVERRIDE { SetUpWithConfig(GetDefaultConfig()); } + virtual void SetUp() override { SetUpWithConfig(GetDefaultConfig()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { gestures_.clear(); gesture_provider_.reset(); } // GestureProviderClient - virtual void OnGestureEvent(const GestureEventData& gesture) OVERRIDE { + virtual void OnGestureEvent(const GestureEventData& gesture) override { if (gesture.type() == ET_GESTURE_SCROLL_BEGIN) active_scroll_begin_event_.reset(new GestureEventData(gesture)); gestures_.push_back(gesture); diff --git a/ui/events/gesture_detection/motion_event_buffer.cc b/ui/events/gesture_detection/motion_event_buffer.cc index e8e0eb1..11d2df7 100644 --- a/ui/events/gesture_detection/motion_event_buffer.cc +++ b/ui/events/gesture_detection/motion_event_buffer.cc @@ -175,96 +175,96 @@ class CompoundMotionEvent : public ui::MotionEvent { } virtual ~CompoundMotionEvent() {} - virtual int GetId() const OVERRIDE { return latest().GetId(); } + virtual int GetId() const override { return latest().GetId(); } - virtual Action GetAction() const OVERRIDE { return latest().GetAction(); } + virtual Action GetAction() const override { return latest().GetAction(); } - virtual int GetActionIndex() const OVERRIDE { + virtual int GetActionIndex() const override { return latest().GetActionIndex(); } - virtual size_t GetPointerCount() const OVERRIDE { + virtual size_t GetPointerCount() const override { return latest().GetPointerCount(); } - virtual int GetPointerId(size_t pointer_index) const OVERRIDE { + virtual int GetPointerId(size_t pointer_index) const override { return latest().GetPointerId(pointer_index); } - virtual float GetX(size_t pointer_index) const OVERRIDE { + virtual float GetX(size_t pointer_index) const override { return latest().GetX(pointer_index); } - virtual float GetY(size_t pointer_index) const OVERRIDE { + virtual float GetY(size_t pointer_index) const override { return latest().GetY(pointer_index); } - virtual float GetRawX(size_t pointer_index) const OVERRIDE { + virtual float GetRawX(size_t pointer_index) const override { return latest().GetRawX(pointer_index); } - virtual float GetRawY(size_t pointer_index) const OVERRIDE { + virtual float GetRawY(size_t pointer_index) const override { return latest().GetRawY(pointer_index); } - virtual float GetTouchMajor(size_t pointer_index) const OVERRIDE { + virtual float GetTouchMajor(size_t pointer_index) const override { return latest().GetTouchMajor(pointer_index); } - virtual float GetTouchMinor(size_t pointer_index) const OVERRIDE { + virtual float GetTouchMinor(size_t pointer_index) const override { return latest().GetTouchMinor(pointer_index); } - virtual float GetOrientation(size_t pointer_index) const OVERRIDE { + virtual float GetOrientation(size_t pointer_index) const override { return latest().GetOrientation(pointer_index); } - virtual float GetPressure(size_t pointer_index) const OVERRIDE { + virtual float GetPressure(size_t pointer_index) const override { return latest().GetPressure(pointer_index); } - virtual ToolType GetToolType(size_t pointer_index) const OVERRIDE { + virtual ToolType GetToolType(size_t pointer_index) const override { return latest().GetToolType(pointer_index); } - virtual int GetButtonState() const OVERRIDE { + virtual int GetButtonState() const override { return latest().GetButtonState(); } - virtual int GetFlags() const OVERRIDE { return latest().GetFlags(); } + virtual int GetFlags() const override { return latest().GetFlags(); } - virtual base::TimeTicks GetEventTime() const OVERRIDE { + virtual base::TimeTicks GetEventTime() const override { return latest().GetEventTime(); } - virtual size_t GetHistorySize() const OVERRIDE { return events_.size() - 1; } + virtual size_t GetHistorySize() const override { return events_.size() - 1; } virtual base::TimeTicks GetHistoricalEventTime( - size_t historical_index) const OVERRIDE { + size_t historical_index) const override { DCHECK_LT(historical_index, GetHistorySize()); return events_[historical_index]->GetEventTime(); } virtual float GetHistoricalTouchMajor( size_t pointer_index, - size_t historical_index) const OVERRIDE { + size_t historical_index) const override { DCHECK_LT(historical_index, GetHistorySize()); return events_[historical_index]->GetTouchMajor(); } virtual float GetHistoricalX(size_t pointer_index, - size_t historical_index) const OVERRIDE { + size_t historical_index) const override { DCHECK_LT(historical_index, GetHistorySize()); return events_[historical_index]->GetX(pointer_index); } virtual float GetHistoricalY(size_t pointer_index, - size_t historical_index) const OVERRIDE { + size_t historical_index) const override { DCHECK_LT(historical_index, GetHistorySize()); return events_[historical_index]->GetY(pointer_index); } - virtual scoped_ptr<MotionEvent> Clone() const OVERRIDE { + virtual scoped_ptr<MotionEvent> Clone() const override { MotionEventVector cloned_events; cloned_events.reserve(events_.size()); for (size_t i = 0; i < events_.size(); ++i) @@ -273,7 +273,7 @@ class CompoundMotionEvent : public ui::MotionEvent { new CompoundMotionEvent(cloned_events.Pass())); } - virtual scoped_ptr<MotionEvent> Cancel() const OVERRIDE { + virtual scoped_ptr<MotionEvent> Cancel() const override { return latest().Cancel(); } diff --git a/ui/events/gesture_detection/motion_event_buffer_unittest.cc b/ui/events/gesture_detection/motion_event_buffer_unittest.cc index f51897f..badbd98 100644 --- a/ui/events/gesture_detection/motion_event_buffer_unittest.cc +++ b/ui/events/gesture_detection/motion_event_buffer_unittest.cc @@ -44,11 +44,11 @@ class MotionEventBufferTest : public testing::Test, virtual ~MotionEventBufferTest() {} // MotionEventBufferClient implementation. - virtual void ForwardMotionEvent(const MotionEvent& event) OVERRIDE { + virtual void ForwardMotionEvent(const MotionEvent& event) override { forwarded_events_.push_back(event.Clone().release()); } - virtual void SetNeedsFlush() OVERRIDE { needs_flush_ = true; } + virtual void SetNeedsFlush() override { needs_flush_ = true; } bool GetAndResetNeedsFlush() { bool needs_flush = needs_flush_; diff --git a/ui/events/gesture_detection/motion_event_generic.h b/ui/events/gesture_detection/motion_event_generic.h index 2750cb2..41911c1 100644 --- a/ui/events/gesture_detection/motion_event_generic.h +++ b/ui/events/gesture_detection/motion_event_generic.h @@ -39,25 +39,25 @@ class GESTURE_DETECTION_EXPORT MotionEventGeneric : public MotionEvent { virtual ~MotionEventGeneric(); // MotionEvent implementation. - virtual int GetId() const OVERRIDE; - virtual Action GetAction() const OVERRIDE; - virtual int GetActionIndex() const OVERRIDE; - virtual size_t GetPointerCount() const OVERRIDE; - virtual int GetPointerId(size_t pointer_index) const OVERRIDE; - virtual float GetX(size_t pointer_index) const OVERRIDE; - virtual float GetY(size_t pointer_index) const OVERRIDE; - virtual float GetRawX(size_t pointer_index) const OVERRIDE; - virtual float GetRawY(size_t pointer_index) const OVERRIDE; - virtual float GetTouchMajor(size_t pointer_index) const OVERRIDE; - virtual float GetTouchMinor(size_t pointer_index) const OVERRIDE; - virtual float GetOrientation(size_t pointer_index) const OVERRIDE; - virtual float GetPressure(size_t pointer_index) const OVERRIDE; - virtual ToolType GetToolType(size_t pointer_index) const OVERRIDE; - virtual int GetButtonState() const OVERRIDE; - virtual int GetFlags() const OVERRIDE; - virtual base::TimeTicks GetEventTime() const OVERRIDE; - virtual scoped_ptr<MotionEvent> Clone() const OVERRIDE; - virtual scoped_ptr<MotionEvent> Cancel() const OVERRIDE; + virtual int GetId() const override; + virtual Action GetAction() const override; + virtual int GetActionIndex() const override; + virtual size_t GetPointerCount() const override; + virtual int GetPointerId(size_t pointer_index) const override; + virtual float GetX(size_t pointer_index) const override; + virtual float GetY(size_t pointer_index) const override; + virtual float GetRawX(size_t pointer_index) const override; + virtual float GetRawY(size_t pointer_index) const override; + virtual float GetTouchMajor(size_t pointer_index) const override; + virtual float GetTouchMinor(size_t pointer_index) const override; + virtual float GetOrientation(size_t pointer_index) const override; + virtual float GetPressure(size_t pointer_index) const override; + virtual ToolType GetToolType(size_t pointer_index) const override; + virtual int GetButtonState() const override; + virtual int GetFlags() const override; + virtual base::TimeTicks GetEventTime() const override; + virtual scoped_ptr<MotionEvent> Clone() const override; + virtual scoped_ptr<MotionEvent> Cancel() const override; void PushPointer(const PointerProperties& pointer); diff --git a/ui/events/gesture_detection/touch_disposition_gesture_filter_unittest.cc b/ui/events/gesture_detection/touch_disposition_gesture_filter_unittest.cc index 7e99c94..d8a2551 100644 --- a/ui/events/gesture_detection/touch_disposition_gesture_filter_unittest.cc +++ b/ui/events/gesture_detection/touch_disposition_gesture_filter_unittest.cc @@ -26,17 +26,17 @@ class TouchDispositionGestureFilterTest virtual ~TouchDispositionGestureFilterTest() {} // testing::Test - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { queue_.reset(new TouchDispositionGestureFilter(this)); touch_event_.set_flags(kDefaultEventFlags); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { queue_.reset(); } // TouchDispositionGestureFilterClient - virtual void ForwardGestureEvent(const GestureEventData& event) OVERRIDE { + virtual void ForwardGestureEvent(const GestureEventData& event) override { ++sent_gesture_count_; last_sent_gesture_.reset(new GestureEventData(event)); sent_gestures_.push_back(event.type()); diff --git a/ui/events/gesture_detection/velocity_tracker.cc b/ui/events/gesture_detection/velocity_tracker.cc index 16454e8..a3fd83e 100644 --- a/ui/events/gesture_detection/velocity_tracker.cc +++ b/ui/events/gesture_detection/velocity_tracker.cc @@ -121,13 +121,13 @@ class LeastSquaresVelocityTrackerStrategy : public VelocityTrackerStrategy { Weighting weighting = WEIGHTING_NONE); virtual ~LeastSquaresVelocityTrackerStrategy(); - virtual void Clear() OVERRIDE; - virtual void ClearPointers(BitSet32 id_bits) OVERRIDE; + virtual void Clear() override; + virtual void ClearPointers(BitSet32 id_bits) override; virtual void AddMovement(const TimeTicks& event_time, BitSet32 id_bits, - const Position* positions) OVERRIDE; + const Position* positions) override; virtual bool GetEstimator(uint32_t id, - Estimator* out_estimator) const OVERRIDE; + Estimator* out_estimator) const override; private: // Sample horizon. @@ -160,13 +160,13 @@ class IntegratingVelocityTrackerStrategy : public VelocityTrackerStrategy { explicit IntegratingVelocityTrackerStrategy(uint32_t degree); virtual ~IntegratingVelocityTrackerStrategy(); - virtual void Clear() OVERRIDE; - virtual void ClearPointers(BitSet32 id_bits) OVERRIDE; + virtual void Clear() override; + virtual void ClearPointers(BitSet32 id_bits) override; virtual void AddMovement(const TimeTicks& event_time, BitSet32 id_bits, - const Position* positions) OVERRIDE; + const Position* positions) override; virtual bool GetEstimator(uint32_t id, - Estimator* out_estimator) const OVERRIDE; + Estimator* out_estimator) const override; private: // Current state estimate for a particular pointer. diff --git a/ui/events/gestures/gesture_provider_aura.h b/ui/events/gestures/gesture_provider_aura.h index 712b84f..6b649dc 100644 --- a/ui/events/gestures/gesture_provider_aura.h +++ b/ui/events/gestures/gesture_provider_aura.h @@ -35,7 +35,7 @@ class EVENTS_EXPORT GestureProviderAura : public GestureProviderClient { ScopedVector<GestureEvent>* GetAndResetPendingGestures(); // GestureProviderClient implementation - virtual void OnGestureEvent(const GestureEventData& gesture) OVERRIDE; + virtual void OnGestureEvent(const GestureEventData& gesture) override; private: bool IsConsideredDoubleTap(const GestureEventData& previous_tap, diff --git a/ui/events/gestures/gesture_provider_aura_unittest.cc b/ui/events/gestures/gesture_provider_aura_unittest.cc index e2b1523..11cc3ca 100644 --- a/ui/events/gestures/gesture_provider_aura_unittest.cc +++ b/ui/events/gestures/gesture_provider_aura_unittest.cc @@ -17,13 +17,13 @@ class GestureProviderAuraTest : public testing::Test, virtual ~GestureProviderAuraTest() {} - virtual void OnGestureEvent(GestureEvent* event) OVERRIDE {} + virtual void OnGestureEvent(GestureEvent* event) override {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { provider_.reset(new GestureProviderAura(this)); } - virtual void TearDown() OVERRIDE { provider_.reset(); } + virtual void TearDown() override { provider_.reset(); } GestureProviderAura* provider() { return provider_.get(); } diff --git a/ui/events/gestures/gesture_recognizer_impl.h b/ui/events/gestures/gesture_recognizer_impl.h index 7ba74f3..60edfba 100644 --- a/ui/events/gestures/gesture_recognizer_impl.h +++ b/ui/events/gestures/gesture_recognizer_impl.h @@ -37,16 +37,16 @@ class EVENTS_EXPORT GestureRecognizerImpl : public GestureRecognizer, // Overridden from GestureRecognizer virtual GestureConsumer* GetTouchLockedTarget( - const TouchEvent& event) OVERRIDE; + const TouchEvent& event) override; virtual GestureConsumer* GetTargetForGestureEvent( - const GestureEvent& event) OVERRIDE; + const GestureEvent& event) override; virtual GestureConsumer* GetTargetForLocation( - const gfx::PointF& location, int source_device_id) OVERRIDE; + const gfx::PointF& location, int source_device_id) override; virtual void TransferEventsTo(GestureConsumer* current_consumer, - GestureConsumer* new_consumer) OVERRIDE; + GestureConsumer* new_consumer) override; virtual bool GetLastTouchPointForTarget(GestureConsumer* consumer, - gfx::PointF* point) OVERRIDE; - virtual bool CancelActiveTouches(GestureConsumer* consumer) OVERRIDE; + gfx::PointF* point) override; + virtual bool CancelActiveTouches(GestureConsumer* consumer) override; protected: virtual GestureProviderAura* GetGestureProviderForConsumer( @@ -60,25 +60,25 @@ class EVENTS_EXPORT GestureRecognizerImpl : public GestureRecognizer, // Overridden from GestureRecognizer virtual bool ProcessTouchEventPreDispatch(const TouchEvent& event, - GestureConsumer* consumer) OVERRIDE; + GestureConsumer* consumer) override; virtual Gestures* ProcessTouchEventPostDispatch( const TouchEvent& event, ui::EventResult result, - GestureConsumer* consumer) OVERRIDE; + GestureConsumer* consumer) override; virtual Gestures* ProcessTouchEventOnAsyncAck( const TouchEvent& event, ui::EventResult result, - GestureConsumer* consumer) OVERRIDE; + GestureConsumer* consumer) override; virtual bool CleanupStateForConsumer(GestureConsumer* consumer) - OVERRIDE; - virtual void AddGestureEventHelper(GestureEventHelper* helper) OVERRIDE; - virtual void RemoveGestureEventHelper(GestureEventHelper* helper) OVERRIDE; + override; + virtual void AddGestureEventHelper(GestureEventHelper* helper) override; + virtual void RemoveGestureEventHelper(GestureEventHelper* helper) override; // Overridden from GestureProviderAuraClient - virtual void OnGestureEvent(GestureEvent* event) OVERRIDE; + virtual void OnGestureEvent(GestureEvent* event) override; // Convenience method to find the GestureEventHelper that can dispatch events // to a specific |consumer|. diff --git a/ui/events/gestures/gesture_recognizer_impl_mac.cc b/ui/events/gestures/gesture_recognizer_impl_mac.cc index 4dfa311..b123593 100644 --- a/ui/events/gestures/gesture_recognizer_impl_mac.cc +++ b/ui/events/gestures/gesture_recognizer_impl_mac.cc @@ -19,48 +19,48 @@ class GestureRecognizerImplMac : public GestureRecognizer { private: virtual bool ProcessTouchEventPreDispatch( const TouchEvent& event, - GestureConsumer* consumer) OVERRIDE { + GestureConsumer* consumer) override { return false; } virtual Gestures* ProcessTouchEventPostDispatch( const TouchEvent& event, ui::EventResult result, - GestureConsumer* consumer) OVERRIDE { + GestureConsumer* consumer) override { return NULL; } virtual Gestures* ProcessTouchEventOnAsyncAck( const TouchEvent& event, ui::EventResult result, - GestureConsumer* consumer) OVERRIDE { + GestureConsumer* consumer) override { return NULL; }; - virtual bool CleanupStateForConsumer(GestureConsumer* consumer) OVERRIDE { + virtual bool CleanupStateForConsumer(GestureConsumer* consumer) override { return false; } virtual GestureConsumer* GetTouchLockedTarget( - const TouchEvent& event) OVERRIDE { + const TouchEvent& event) override { return NULL; } virtual GestureConsumer* GetTargetForGestureEvent( - const GestureEvent& event) OVERRIDE { + const GestureEvent& event) override { return NULL; } virtual GestureConsumer* GetTargetForLocation(const gfx::PointF& location, - int source_device_id) OVERRIDE { + int source_device_id) override { return NULL; } virtual void TransferEventsTo(GestureConsumer* current_consumer, - GestureConsumer* new_consumer) OVERRIDE {} + GestureConsumer* new_consumer) override {} virtual bool GetLastTouchPointForTarget(GestureConsumer* consumer, - gfx::PointF* point) OVERRIDE { + gfx::PointF* point) override { return false; } - virtual bool CancelActiveTouches(GestureConsumer* consumer) OVERRIDE { + virtual bool CancelActiveTouches(GestureConsumer* consumer) override { return false; } - virtual void AddGestureEventHelper(GestureEventHelper* helper) OVERRIDE {} - virtual void RemoveGestureEventHelper(GestureEventHelper* helper) OVERRIDE {} + virtual void AddGestureEventHelper(GestureEventHelper* helper) override {} + virtual void RemoveGestureEventHelper(GestureEventHelper* helper) override {} DISALLOW_COPY_AND_ASSIGN(GestureRecognizerImplMac); }; diff --git a/ui/events/gestures/motion_event_aura.h b/ui/events/gestures/motion_event_aura.h index ec956fc..7ba2726 100644 --- a/ui/events/gestures/motion_event_aura.h +++ b/ui/events/gestures/motion_event_aura.h @@ -24,26 +24,26 @@ class EVENTS_EXPORT MotionEventAura : public MotionEvent { void OnTouch(const TouchEvent& touch); // MotionEvent implementation. - virtual int GetId() const OVERRIDE; - virtual Action GetAction() const OVERRIDE; - virtual int GetActionIndex() const OVERRIDE; - virtual size_t GetPointerCount() const OVERRIDE; - virtual int GetPointerId(size_t pointer_index) const OVERRIDE; - virtual float GetX(size_t pointer_index) const OVERRIDE; - virtual float GetY(size_t pointer_index) const OVERRIDE; - virtual float GetRawX(size_t pointer_index) const OVERRIDE; - virtual float GetRawY(size_t pointer_index) const OVERRIDE; - virtual float GetTouchMajor(size_t pointer_index) const OVERRIDE; - virtual float GetTouchMinor(size_t pointer_index) const OVERRIDE; - virtual float GetOrientation(size_t pointer_index) const OVERRIDE; - virtual float GetPressure(size_t pointer_index) const OVERRIDE; - virtual ToolType GetToolType(size_t pointer_index) const OVERRIDE; - virtual int GetButtonState() const OVERRIDE; - virtual int GetFlags() const OVERRIDE; - virtual base::TimeTicks GetEventTime() const OVERRIDE; - - virtual scoped_ptr<MotionEvent> Clone() const OVERRIDE; - virtual scoped_ptr<MotionEvent> Cancel() const OVERRIDE; + virtual int GetId() const override; + virtual Action GetAction() const override; + virtual int GetActionIndex() const override; + virtual size_t GetPointerCount() const override; + virtual int GetPointerId(size_t pointer_index) const override; + virtual float GetX(size_t pointer_index) const override; + virtual float GetY(size_t pointer_index) const override; + virtual float GetRawX(size_t pointer_index) const override; + virtual float GetRawY(size_t pointer_index) const override; + virtual float GetTouchMajor(size_t pointer_index) const override; + virtual float GetTouchMinor(size_t pointer_index) const override; + virtual float GetOrientation(size_t pointer_index) const override; + virtual float GetPressure(size_t pointer_index) const override; + virtual ToolType GetToolType(size_t pointer_index) const override; + virtual int GetButtonState() const override; + virtual int GetFlags() const override; + virtual base::TimeTicks GetEventTime() const override; + + virtual scoped_ptr<MotionEvent> Clone() const override; + virtual scoped_ptr<MotionEvent> Cancel() const override; int GetSourceDeviceId(size_t pointer_index) const; diff --git a/ui/events/latency_info.cc b/ui/events/latency_info.cc index 5cd1521..5210c36 100644 --- a/ui/events/latency_info.cc +++ b/ui/events/latency_info.cc @@ -73,7 +73,7 @@ class LatencyInfoTracedValue : public base::debug::ConvertableToTraceFormat { static scoped_refptr<ConvertableToTraceFormat> FromValue( scoped_ptr<base::Value> value); - virtual void AppendAsTraceFormat(std::string* out) const OVERRIDE; + virtual void AppendAsTraceFormat(std::string* out) const override; private: explicit LatencyInfoTracedValue(base::Value* value); diff --git a/ui/events/ozone/device/device_manager_manual.h b/ui/events/ozone/device/device_manager_manual.h index 9d1cf61..9104774 100644 --- a/ui/events/ozone/device/device_manager_manual.h +++ b/ui/events/ozone/device/device_manager_manual.h @@ -17,9 +17,9 @@ class DeviceManagerManual : public DeviceManager { private: // DeviceManager overrides: - virtual void ScanDevices(DeviceEventObserver* observer) OVERRIDE; - virtual void AddObserver(DeviceEventObserver* observer) OVERRIDE; - virtual void RemoveObserver(DeviceEventObserver* observer) OVERRIDE; + virtual void ScanDevices(DeviceEventObserver* observer) override; + virtual void AddObserver(DeviceEventObserver* observer) override; + virtual void RemoveObserver(DeviceEventObserver* observer) override; DISALLOW_COPY_AND_ASSIGN(DeviceManagerManual); }; diff --git a/ui/events/ozone/device/udev/device_manager_udev.h b/ui/events/ozone/device/udev/device_manager_udev.h index 8a7537a..13c76b94 100644 --- a/ui/events/ozone/device/udev/device_manager_udev.h +++ b/ui/events/ozone/device/udev/device_manager_udev.h @@ -28,13 +28,13 @@ class DeviceManagerUdev void CreateMonitor(); // DeviceManager overrides: - virtual void ScanDevices(DeviceEventObserver* observer) OVERRIDE; - virtual void AddObserver(DeviceEventObserver* observer) OVERRIDE; - virtual void RemoveObserver(DeviceEventObserver* observer) OVERRIDE; + virtual void ScanDevices(DeviceEventObserver* observer) override; + virtual void AddObserver(DeviceEventObserver* observer) override; + virtual void RemoveObserver(DeviceEventObserver* observer) override; // base::MessagePumpLibevent::Watcher overrides: - virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE; - virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE; + virtual void OnFileCanReadWithoutBlocking(int fd) override; + virtual void OnFileCanWriteWithoutBlocking(int fd) override; device::ScopedUdevPtr udev_; device::ScopedUdevMonitorPtr monitor_; diff --git a/ui/events/ozone/evdev/event_converter_evdev.h b/ui/events/ozone/evdev/event_converter_evdev.h index b4b2463..f968c7a 100644 --- a/ui/events/ozone/evdev/event_converter_evdev.h +++ b/ui/events/ozone/evdev/event_converter_evdev.h @@ -40,7 +40,7 @@ class EVENTS_OZONE_EVDEV_EXPORT EventConverterEvdev protected: // base::MessagePumpLibevent::Watcher: - virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE; + virtual void OnFileCanWriteWithoutBlocking(int fd) override; // File descriptor to read. int fd_; diff --git a/ui/events/ozone/evdev/event_factory_evdev.h b/ui/events/ozone/evdev/event_factory_evdev.h index 15031e4..f169370 100644 --- a/ui/events/ozone/evdev/event_factory_evdev.h +++ b/ui/events/ozone/evdev/event_factory_evdev.h @@ -54,10 +54,10 @@ class EVENTS_OZONE_EVDEV_EXPORT EventFactoryEvdev : public DeviceEventObserver, // DeviceEventObserver overrides: // // Callback for device add (on UI thread). - virtual void OnDeviceEvent(const DeviceEvent& event) OVERRIDE; + virtual void OnDeviceEvent(const DeviceEvent& event) override; // PlatformEventSource: - virtual void OnDispatcherListChanged() OVERRIDE; + virtual void OnDispatcherListChanged() override; // Owned per-device event converters (by path). std::map<base::FilePath, EventConverterEvdev*> converters_; diff --git a/ui/events/ozone/evdev/key_event_converter_evdev.h b/ui/events/ozone/evdev/key_event_converter_evdev.h index d1cab8c..9a2f771 100644 --- a/ui/events/ozone/evdev/key_event_converter_evdev.h +++ b/ui/events/ozone/evdev/key_event_converter_evdev.h @@ -27,7 +27,7 @@ class EVENTS_OZONE_EVDEV_EXPORT KeyEventConverterEvdev virtual ~KeyEventConverterEvdev(); // EventConverterEvdev: - virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE; + virtual void OnFileCanReadWithoutBlocking(int fd) override; void ProcessEvents(const struct input_event* inputs, int count); diff --git a/ui/events/ozone/evdev/key_event_converter_evdev_unittest.cc b/ui/events/ozone/evdev/key_event_converter_evdev_unittest.cc index 575e86d..a144bce 100644 --- a/ui/events/ozone/evdev/key_event_converter_evdev_unittest.cc +++ b/ui/events/ozone/evdev/key_event_converter_evdev_unittest.cc @@ -57,7 +57,7 @@ class KeyEventConverterEvdevTest : public testing::Test { KeyEventConverterEvdevTest() {} // Overridden from testing::Test: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { // Set up pipe to satisfy message pump (unused). int evdev_io[2]; @@ -69,7 +69,7 @@ class KeyEventConverterEvdevTest : public testing::Test { modifiers_ = new ui::EventModifiersEvdev(); device_ = new ui::MockKeyEventConverterEvdev(events_in_, modifiers_); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { delete device_; delete modifiers_; close(events_in_); diff --git a/ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.h b/ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.h index a67d037..c056496 100644 --- a/ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.h +++ b/ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.h @@ -42,7 +42,7 @@ class EventReaderLibevdevCros : public EventConverterEvdev { ~EventReaderLibevdevCros(); // EventConverterEvdev: - virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE; + virtual void OnFileCanReadWithoutBlocking(int fd) override; private: static void OnSynReport(void* data, diff --git a/ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.h b/ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.h index 1044a11..6bb87f3 100644 --- a/ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.h +++ b/ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.h @@ -46,10 +46,10 @@ class EVENTS_OZONE_EVDEV_EXPORT GestureInterpreterLibevdevCros // Overriden from ui::EventReaderLibevdevCros::Delegate virtual void OnLibEvdevCrosOpen(Evdev* evdev, - EventStateRec* evstate) OVERRIDE; + EventStateRec* evstate) override; virtual void OnLibEvdevCrosEvent(Evdev* evdev, EventStateRec* evstate, - const timeval& time) OVERRIDE; + const timeval& time) override; // Handler for gesture events generated from libgestures. void OnGestureReady(const Gesture* gesture); diff --git a/ui/events/ozone/evdev/touch_event_converter_evdev.h b/ui/events/ozone/evdev/touch_event_converter_evdev.h index f85e0febd..83aa13ac 100644 --- a/ui/events/ozone/evdev/touch_event_converter_evdev.h +++ b/ui/events/ozone/evdev/touch_event_converter_evdev.h @@ -33,8 +33,8 @@ class EVENTS_OZONE_EVDEV_EXPORT TouchEventConverterEvdev virtual ~TouchEventConverterEvdev(); // EventConverterEvdev: - virtual bool HasTouchscreen() const OVERRIDE; - virtual gfx::Size GetTouchscreenSize() const OVERRIDE; + virtual bool HasTouchscreen() const override; + virtual gfx::Size GetTouchscreenSize() const override; private: friend class MockTouchEventConverterEvdev; @@ -43,7 +43,7 @@ class EVENTS_OZONE_EVDEV_EXPORT TouchEventConverterEvdev void Init(const EventDeviceInfo& info); // Overidden from base::MessagePumpLibevent::Watcher. - virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE; + virtual void OnFileCanReadWithoutBlocking(int fd) override; virtual bool Reinitialize(); diff --git a/ui/events/ozone/evdev/touch_event_converter_evdev_unittest.cc b/ui/events/ozone/evdev/touch_event_converter_evdev_unittest.cc index 95dc5c4..3e76476 100644 --- a/ui/events/ozone/evdev/touch_event_converter_evdev_unittest.cc +++ b/ui/events/ozone/evdev/touch_event_converter_evdev_unittest.cc @@ -59,7 +59,7 @@ class MockTouchEventConverterEvdev : public TouchEventConverterEvdev { new TouchEvent(*static_cast<TouchEvent*>(event))); } - virtual bool Reinitialize() OVERRIDE { return true; } + virtual bool Reinitialize() override { return true; } private: int read_pipe_; @@ -120,7 +120,7 @@ class TouchEventConverterEvdevTest : public testing::Test { TouchEventConverterEvdevTest() {} // Overridden from testing::Test: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { // Set up pipe to satisfy message pump (unused). int evdev_io[2]; if (pipe(evdev_io)) @@ -133,7 +133,7 @@ class TouchEventConverterEvdevTest : public testing::Test { events_in_, base::FilePath(kTestDevicePath)); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { delete device_; delete loop_; } diff --git a/ui/events/platform/platform_event_source_unittest.cc b/ui/events/platform/platform_event_source_unittest.cc index cdbd0c4..cc34960 100644 --- a/ui/events/platform/platform_event_source_unittest.cc +++ b/ui/events/platform/platform_event_source_unittest.cc @@ -65,7 +65,7 @@ class TestPlatformEventSource : public PlatformEventSource { } // PlatformEventSource: - virtual void StopCurrentEventStream() OVERRIDE { + virtual void StopCurrentEventStream() override { stop_stream_ = true; } @@ -93,11 +93,11 @@ class TestPlatformEventDispatcher : public PlatformEventDispatcher { protected: // PlatformEventDispatcher: - virtual bool CanDispatchEvent(const PlatformEvent& event) OVERRIDE { + virtual bool CanDispatchEvent(const PlatformEvent& event) override { return true; } - virtual uint32_t DispatchEvent(const PlatformEvent& event) OVERRIDE { + virtual uint32_t DispatchEvent(const PlatformEvent& event) override { list_->push_back(id_); return post_dispatch_action_; } @@ -123,11 +123,11 @@ class TestPlatformEventObserver : public PlatformEventObserver { protected: // PlatformEventObserver: - virtual void WillProcessEvent(const PlatformEvent& event) OVERRIDE { + virtual void WillProcessEvent(const PlatformEvent& event) override { list_->push_back(id_); } - virtual void DidProcessEvent(const PlatformEvent& event) OVERRIDE {} + virtual void DidProcessEvent(const PlatformEvent& event) override {} private: int id_; @@ -145,7 +145,7 @@ class PlatformEventTest : public testing::Test { protected: // testing::Test: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { source_.reset(new TestPlatformEventSource()); } @@ -342,7 +342,7 @@ class RunCallbackDuringDispatch : public TestPlatformEventDispatcher { protected: // PlatformEventDispatcher: - virtual uint32_t DispatchEvent(const PlatformEvent& event) OVERRIDE { + virtual uint32_t DispatchEvent(const PlatformEvent& event) override { if (!callback_.is_null()) callback_.Run(); return TestPlatformEventDispatcher::DispatchEvent(event); @@ -530,7 +530,7 @@ class ScopedDispatcherRestoresAfterDestroy : public PlatformEventTestWithMessageLoop { public: // PlatformEventTestWithMessageLoop: - virtual void RunTestImpl() OVERRIDE { + virtual void RunTestImpl() override { std::vector<int> list; TestPlatformEventDispatcher dispatcher(10, &list); TestPlatformEventObserver observer(15, &list); @@ -581,11 +581,11 @@ class DestroyScopedHandleDispatcher : public TestPlatformEventDispatcher { private: // PlatformEventDispatcher: - virtual bool CanDispatchEvent(const PlatformEvent& event) OVERRIDE { + virtual bool CanDispatchEvent(const PlatformEvent& event) override { return true; } - virtual uint32_t DispatchEvent(const PlatformEvent& event) OVERRIDE { + virtual uint32_t DispatchEvent(const PlatformEvent& event) override { handler_.reset(); uint32_t action = TestPlatformEventDispatcher::DispatchEvent(event); if (!callback_.is_null()) { @@ -640,7 +640,7 @@ class DestroyedNestedOverriddenDispatcherQuitsNestedLoopIteration } // PlatformEventTestWithMessageLoop: - virtual void RunTestImpl() OVERRIDE { + virtual void RunTestImpl() override { std::vector<int> list; TestPlatformEventDispatcher dispatcher(10, &list); TestPlatformEventObserver observer(15, &list); @@ -740,7 +740,7 @@ class ConsecutiveOverriddenDispatcherInTheSameMessageLoopIteration } // PlatformEventTestWithMessageLoop: - virtual void RunTestImpl() OVERRIDE { + virtual void RunTestImpl() override { std::vector<int> list; TestPlatformEventDispatcher dispatcher(10, &list); TestPlatformEventObserver observer(15, &list); diff --git a/ui/events/platform/x11/x11_event_source.h b/ui/events/platform/x11/x11_event_source.h index 598afa8..206ca5a 100644 --- a/ui/events/platform/x11/x11_event_source.h +++ b/ui/events/platform/x11/x11_event_source.h @@ -48,8 +48,8 @@ class EVENTS_EXPORT X11EventSource : public PlatformEventSource { private: // PlatformEventSource: - virtual uint32_t DispatchEvent(XEvent* xevent) OVERRIDE; - virtual void StopCurrentEventStream() OVERRIDE; + virtual uint32_t DispatchEvent(XEvent* xevent) override; + virtual void StopCurrentEventStream() override; // The connection to the X11 server used to receive the events. XDisplay* display_; diff --git a/ui/events/platform/x11/x11_event_source_libevent.cc b/ui/events/platform/x11/x11_event_source_libevent.cc index d92e12a..8ad7931 100644 --- a/ui/events/platform/x11/x11_event_source_libevent.cc +++ b/ui/events/platform/x11/x11_event_source_libevent.cc @@ -39,16 +39,16 @@ class X11EventSourceLibevent : public X11EventSource, } // PlatformEventSource: - virtual void OnDispatcherListChanged() OVERRIDE { + virtual void OnDispatcherListChanged() override { AddEventWatcher(); } // base::MessagePumpLibevent::Watcher: - virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE { + virtual void OnFileCanReadWithoutBlocking(int fd) override { DispatchXEvents(); } - virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE { + virtual void OnFileCanWriteWithoutBlocking(int fd) override { NOTREACHED(); } diff --git a/ui/events/test/mock_motion_event.h b/ui/events/test/mock_motion_event.h index 9ae9a719..5c34b71 100644 --- a/ui/events/test/mock_motion_event.h +++ b/ui/events/test/mock_motion_event.h @@ -40,8 +40,8 @@ struct MockMotionEvent : public MotionEventGeneric { virtual ~MockMotionEvent(); // MotionEvent methods. - virtual scoped_ptr<MotionEvent> Clone() const OVERRIDE; - virtual scoped_ptr<MotionEvent> Cancel() const OVERRIDE; + virtual scoped_ptr<MotionEvent> Clone() const override; + virtual scoped_ptr<MotionEvent> Cancel() const override; // Utility methods. void PressPoint(float x, float y); diff --git a/ui/events/test/platform_event_waiter.h b/ui/events/test/platform_event_waiter.h index 259662c..647a011 100644 --- a/ui/events/test/platform_event_waiter.h +++ b/ui/events/test/platform_event_waiter.h @@ -23,8 +23,8 @@ class PlatformEventWaiter : public PlatformEventObserver { virtual ~PlatformEventWaiter(); // PlatformEventObserver: - virtual void WillProcessEvent(const PlatformEvent& event) OVERRIDE; - virtual void DidProcessEvent(const PlatformEvent& event) OVERRIDE; + virtual void WillProcessEvent(const PlatformEvent& event) override; + virtual void DidProcessEvent(const PlatformEvent& event) override; base::Closure success_callback_; PlatformEventMatcher event_matcher_; diff --git a/ui/events/test/test_event_handler.h b/ui/events/test/test_event_handler.h index 8937b25..d501233 100644 --- a/ui/events/test/test_event_handler.h +++ b/ui/events/test/test_event_handler.h @@ -40,11 +40,11 @@ class TestEventHandler : public EventHandler { } // EventHandler overrides: - virtual void OnKeyEvent(KeyEvent* event) OVERRIDE; - virtual void OnMouseEvent(MouseEvent* event) OVERRIDE; - virtual void OnScrollEvent(ScrollEvent* event) OVERRIDE; - virtual void OnTouchEvent(TouchEvent* event) OVERRIDE; - virtual void OnGestureEvent(GestureEvent* event) OVERRIDE; + virtual void OnKeyEvent(KeyEvent* event) override; + virtual void OnMouseEvent(MouseEvent* event) override; + virtual void OnScrollEvent(ScrollEvent* event) override; + virtual void OnTouchEvent(TouchEvent* event) override; + virtual void OnGestureEvent(GestureEvent* event) override; private: // How many events have been received of each type? diff --git a/ui/events/test/test_event_processor.h b/ui/events/test/test_event_processor.h index 5b9a99b..1e42aa1 100644 --- a/ui/events/test/test_event_processor.h +++ b/ui/events/test/test_event_processor.h @@ -32,11 +32,11 @@ class TestEventProcessor : public EventProcessor { void Reset(); // EventProcessor: - virtual bool CanDispatchToTarget(EventTarget* target) OVERRIDE; - virtual EventTarget* GetRootTarget() OVERRIDE; - virtual EventDispatchDetails OnEventFromSource(Event* event) OVERRIDE; - virtual void OnEventProcessingStarted(Event* event) OVERRIDE; - virtual void OnEventProcessingFinished(Event* event) OVERRIDE; + virtual bool CanDispatchToTarget(EventTarget* target) override; + virtual EventTarget* GetRootTarget() override; + virtual EventDispatchDetails OnEventFromSource(Event* event) override; + virtual void OnEventProcessingStarted(Event* event) override; + virtual void OnEventProcessingFinished(Event* event) override; private: scoped_ptr<EventTarget> root_; diff --git a/ui/events/test/test_event_target.h b/ui/events/test/test_event_target.h index 368e295..cadcfa9 100644 --- a/ui/events/test/test_event_target.h +++ b/ui/events/test/test_event_target.h @@ -54,13 +54,13 @@ class TestEventTarget : public EventTarget { bool Contains(TestEventTarget* target) const; // EventTarget: - virtual bool CanAcceptEvent(const ui::Event& event) OVERRIDE; - virtual EventTarget* GetParentTarget() OVERRIDE; - virtual scoped_ptr<EventTargetIterator> GetChildIterator() const OVERRIDE; - virtual EventTargeter* GetEventTargeter() OVERRIDE; + virtual bool CanAcceptEvent(const ui::Event& event) override; + virtual EventTarget* GetParentTarget() override; + virtual scoped_ptr<EventTargetIterator> GetChildIterator() const override; + virtual EventTargeter* GetEventTargeter() override; // EventHandler: - virtual void OnEvent(Event* event) OVERRIDE; + virtual void OnEvent(Event* event) override; private: void set_parent(TestEventTarget* parent) { parent_ = parent; } diff --git a/ui/events/x/events_x_unittest.cc b/ui/events/x/events_x_unittest.cc index d8e2c83..32b121c 100644 --- a/ui/events/x/events_x_unittest.cc +++ b/ui/events/x/events_x_unittest.cc @@ -85,7 +85,7 @@ class EventsXTest : public testing::Test { EventsXTest() {} virtual ~EventsXTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { DeviceDataManagerX11::CreateInstance(); ui::TouchFactory::GetInstance()->ResetForTest(); } diff --git a/ui/gfx/animation/animation.h b/ui/gfx/animation/animation.h index 32d297e..e98f506 100644 --- a/ui/gfx/animation/animation.h +++ b/ui/gfx/animation/animation.h @@ -81,9 +81,9 @@ class GFX_EXPORT Animation : public AnimationContainerElement { AnimationDelegate* delegate() { return delegate_; } // AnimationContainer::Element overrides - virtual void SetStartTime(base::TimeTicks start_time) OVERRIDE; + virtual void SetStartTime(base::TimeTicks start_time) override; virtual void Step(base::TimeTicks time_now) = 0; - virtual base::TimeDelta GetTimerInterval() const OVERRIDE; + virtual base::TimeDelta GetTimerInterval() const override; private: // Interval for the animation. diff --git a/ui/gfx/animation/animation_container_unittest.cc b/ui/gfx/animation/animation_container_unittest.cc index 70d3b0e..ba8e2c9 100644 --- a/ui/gfx/animation/animation_container_unittest.cc +++ b/ui/gfx/animation/animation_container_unittest.cc @@ -26,12 +26,12 @@ class FakeAnimationContainerObserver : public AnimationContainerObserver { private: virtual void AnimationContainerProgressed( - AnimationContainer* container) OVERRIDE { + AnimationContainer* container) override { progressed_count_++; } // Invoked when no more animations are being managed by this container. - virtual void AnimationContainerEmpty(AnimationContainer* container) OVERRIDE { + virtual void AnimationContainerEmpty(AnimationContainer* container) override { empty_ = true; } @@ -47,7 +47,7 @@ class TestAnimation : public LinearAnimation { : LinearAnimation(20, 20, delegate) { } - virtual void AnimateToState(double state) OVERRIDE { + virtual void AnimateToState(double state) override { } private: diff --git a/ui/gfx/animation/animation_unittest.cc b/ui/gfx/animation/animation_unittest.cc index 00f1e26..d86f87a 100644 --- a/ui/gfx/animation/animation_unittest.cc +++ b/ui/gfx/animation/animation_unittest.cc @@ -29,7 +29,7 @@ class RunAnimation : public LinearAnimation { : LinearAnimation(frame_rate, delegate) { } - virtual void AnimateToState(double state) OVERRIDE { + virtual void AnimateToState(double state) override { EXPECT_LE(0.0, state); EXPECT_GE(1.0, state); } @@ -44,7 +44,7 @@ class CancelAnimation : public LinearAnimation { : LinearAnimation(duration, frame_rate, delegate) { } - virtual void AnimateToState(double state) OVERRIDE { + virtual void AnimateToState(double state) override { if (state >= 0.5) Stop(); } @@ -59,7 +59,7 @@ class EndAnimation : public LinearAnimation { : LinearAnimation(duration, frame_rate, delegate) { } - virtual void AnimateToState(double state) OVERRIDE { + virtual void AnimateToState(double state) override { if (state >= 0.5) End(); } @@ -71,7 +71,7 @@ class EndAnimation : public LinearAnimation { // AnimationDelegate implementation that deletes the animation in ended. class DeletingAnimationDelegate : public AnimationDelegate { public: - virtual void AnimationEnded(const Animation* animation) OVERRIDE { + virtual void AnimationEnded(const Animation* animation) override { delete animation; base::MessageLoop::current()->Quit(); } diff --git a/ui/gfx/animation/linear_animation.h b/ui/gfx/animation/linear_animation.h index 401f1be..d74b847 100644 --- a/ui/gfx/animation/linear_animation.h +++ b/ui/gfx/animation/linear_animation.h @@ -30,7 +30,7 @@ class GFX_EXPORT LinearAnimation : public Animation { // Gets the value for the current state, according to the animation curve in // use. This class provides only for a linear relationship, however subclasses // can override this to provide others. - virtual double GetCurrentValue() const OVERRIDE; + virtual double GetCurrentValue() const override; // Change the current state of the animation to |new_value|. void SetCurrentValue(double new_value); @@ -50,16 +50,16 @@ class GFX_EXPORT LinearAnimation : public Animation { // Invoked by the AnimationContainer when the animation is running to advance // the animation. Use |time_now| rather than Time::Now to avoid multiple // animations running at the same time diverging. - virtual void Step(base::TimeTicks time_now) OVERRIDE; + virtual void Step(base::TimeTicks time_now) override; // Overriden to initialize state. - virtual void AnimationStarted() OVERRIDE; + virtual void AnimationStarted() override; // Overriden to advance to the end (if End was invoked). - virtual void AnimationStopped() OVERRIDE; + virtual void AnimationStopped() override; // Overriden to return true if state is not 1. - virtual bool ShouldSendCanceledFromStop() OVERRIDE; + virtual bool ShouldSendCanceledFromStop() override; private: base::TimeDelta duration_; diff --git a/ui/gfx/animation/multi_animation.h b/ui/gfx/animation/multi_animation.h index f0480980..bbcbae4 100644 --- a/ui/gfx/animation/multi_animation.h +++ b/ui/gfx/animation/multi_animation.h @@ -57,15 +57,15 @@ class GFX_EXPORT MultiAnimation : public Animation { // Returns the current value. The current value for a MultiAnimation is // determined from the tween type of the current part. - virtual double GetCurrentValue() const OVERRIDE; + virtual double GetCurrentValue() const override; // Returns the index of the current part. size_t current_part_index() const { return current_part_index_; } protected: // Animation overrides. - virtual void Step(base::TimeTicks time_now) OVERRIDE; - virtual void SetStartTime(base::TimeTicks start_time) OVERRIDE; + virtual void Step(base::TimeTicks time_now) override; + virtual void SetStartTime(base::TimeTicks start_time) override; private: // Returns the part containing the specified time. |time_ms| is reset to be diff --git a/ui/gfx/animation/slide_animation.h b/ui/gfx/animation/slide_animation.h index 8fdf8f8..3795e36 100644 --- a/ui/gfx/animation/slide_animation.h +++ b/ui/gfx/animation/slide_animation.h @@ -66,7 +66,7 @@ class GFX_EXPORT SlideAnimation : public LinearAnimation { int GetSlideDuration() const { return slide_duration_; } void SetTweenType(Tween::Type tween_type) { tween_type_ = tween_type; } - virtual double GetCurrentValue() const OVERRIDE; + virtual double GetCurrentValue() const override; bool IsShowing() const { return showing_; } bool IsClosing() const { return !showing_ && value_end_ < value_current_; } @@ -74,7 +74,7 @@ class GFX_EXPORT SlideAnimation : public LinearAnimation { private: // Overridden from Animation. - virtual void AnimateToState(double state) OVERRIDE; + virtual void AnimateToState(double state) override; AnimationDelegate* target_; diff --git a/ui/gfx/animation/throb_animation.h b/ui/gfx/animation/throb_animation.h index 8bea7f8..27da800 100644 --- a/ui/gfx/animation/throb_animation.h +++ b/ui/gfx/animation/throb_animation.h @@ -29,13 +29,13 @@ class GFX_EXPORT ThrobAnimation : public SlideAnimation { void SetThrobDuration(int duration) { throb_duration_ = duration; } // Overridden to reset to the slide duration. - virtual void Reset() OVERRIDE; - virtual void Reset(double value) OVERRIDE; - virtual void Show() OVERRIDE; - virtual void Hide() OVERRIDE; + virtual void Reset() override; + virtual void Reset(double value) override; + virtual void Show() override; + virtual void Hide() override; // Overridden to maintain the slide duration. - virtual void SetSlideDuration(int duration) OVERRIDE; + virtual void SetSlideDuration(int duration) override; // The number of cycles remaining until the animation stops. void set_cycles_remaining(int value) { cycles_remaining_ = value; } @@ -43,7 +43,7 @@ class GFX_EXPORT ThrobAnimation : public SlideAnimation { protected: // Overriden to continually throb (assuming we're throbbing). - virtual void Step(base::TimeTicks time_now) OVERRIDE; + virtual void Step(base::TimeTicks time_now) override; private: // Resets state such that we behave like SlideAnimation. diff --git a/ui/gfx/color_analysis.h b/ui/gfx/color_analysis.h index dd273bc..b3bd4d2 100644 --- a/ui/gfx/color_analysis.h +++ b/ui/gfx/color_analysis.h @@ -42,7 +42,7 @@ class GFX_EXPORT GridSampler : public KMeanImageSampler { GridSampler(); virtual ~GridSampler(); - virtual int GetSample(int width, int height) OVERRIDE; + virtual int GetSample(int width, int height) override; private: // The number of times GetSample has been called. diff --git a/ui/gfx/color_analysis_unittest.cc b/ui/gfx/color_analysis_unittest.cc index 601089f..128209a 100644 --- a/ui/gfx/color_analysis_unittest.cc +++ b/ui/gfx/color_analysis_unittest.cc @@ -120,7 +120,7 @@ class MockKMeanImageSampler : public KMeanImageSampler { prebaked_sample_results_.push_back(sample); } - virtual int GetSample(int width, int height) OVERRIDE { + virtual int GetSample(int width, int height) override { if (current_result_index_ >= prebaked_sample_results_.size()) { current_result_index_ = 0; } diff --git a/ui/gfx/display_change_notifier_unittest.cc b/ui/gfx/display_change_notifier_unittest.cc index 769c770..700793a 100644 --- a/ui/gfx/display_change_notifier_unittest.cc +++ b/ui/gfx/display_change_notifier_unittest.cc @@ -21,16 +21,16 @@ class MockDisplayObserver : public DisplayObserver { virtual ~MockDisplayObserver() { } - virtual void OnDisplayAdded(const Display& display) OVERRIDE { + virtual void OnDisplayAdded(const Display& display) override { display_added_++; } - virtual void OnDisplayRemoved(const Display& display) OVERRIDE { + virtual void OnDisplayRemoved(const Display& display) override { display_removed_++; } virtual void OnDisplayMetricsChanged(const Display& display, - uint32_t metrics) OVERRIDE { + uint32_t metrics) override { display_changed_++; latest_metrics_change_ = metrics; } diff --git a/ui/gfx/font_fallback_win_unittest.cc b/ui/gfx/font_fallback_win_unittest.cc index ff807cc..e378db8 100644 --- a/ui/gfx/font_fallback_win_unittest.cc +++ b/ui/gfx/font_fallback_win_unittest.cc @@ -24,7 +24,7 @@ class TestLinkedFontsIterator : public internal::LinkedFontsIterator { test_linked_fonts.push_back(font); } - virtual const std::vector<Font>* GetLinkedFonts() const OVERRIDE { + virtual const std::vector<Font>* GetLinkedFonts() const override { return &test_linked_fonts; } diff --git a/ui/gfx/font_render_params_linux_unittest.cc b/ui/gfx/font_render_params_linux_unittest.cc index 46c82b4..a9b230f 100644 --- a/ui/gfx/font_render_params_linux_unittest.cc +++ b/ui/gfx/font_render_params_linux_unittest.cc @@ -27,15 +27,15 @@ class TestFontDelegate : public LinuxFontDelegate { void set_params(const FontRenderParams& params) { params_ = params; } - virtual FontRenderParams GetDefaultFontRenderParams() const OVERRIDE { + virtual FontRenderParams GetDefaultFontRenderParams() const override { return params_; } virtual scoped_ptr<ScopedPangoFontDescription> - GetDefaultPangoFontDescription() const OVERRIDE { + GetDefaultPangoFontDescription() const override { NOTIMPLEMENTED(); return scoped_ptr<ScopedPangoFontDescription>(); } - virtual double GetFontDPI() const OVERRIDE { + virtual double GetFontDPI() const override { NOTIMPLEMENTED(); return 96.0; } diff --git a/ui/gfx/font_render_params_win.cc b/ui/gfx/font_render_params_win.cc index a6fc618..372435d 100644 --- a/ui/gfx/font_render_params_win.cc +++ b/ui/gfx/font_render_params_win.cc @@ -59,7 +59,7 @@ class CachedFontRenderParams : public gfx::SingletonHwnd::Observer { virtual void OnWndProc(HWND hwnd, UINT message, WPARAM wparam, - LPARAM lparam) OVERRIDE { + LPARAM lparam) override { if (message == WM_SETTINGCHANGE) { params_.reset(); gfx::SingletonHwnd::GetInstance()->RemoveObserver(this); diff --git a/ui/gfx/geometry/r_tree_base.h b/ui/gfx/geometry/r_tree_base.h index 21dc86b..b83aeef 100644 --- a/ui/gfx/geometry/r_tree_base.h +++ b/ui/gfx/geometry/r_tree_base.h @@ -96,10 +96,10 @@ class GFX_EXPORT RTreeBase { virtual ~RecordBase(); virtual void AppendIntersectingRecords(const Rect& query_rect, - Records* records_out) const OVERRIDE; - virtual void AppendAllRecords(Records* records_out) const OVERRIDE; - virtual scoped_ptr<NodeBase> RemoveAndReturnLastChild() OVERRIDE; - virtual int Level() const OVERRIDE; + Records* records_out) const override; + virtual void AppendAllRecords(Records* records_out) const override; + virtual scoped_ptr<NodeBase> RemoveAndReturnLastChild() override; + virtual int Level() const override; private: friend class RTreeTest; @@ -115,10 +115,10 @@ class GFX_EXPORT RTreeBase { virtual ~Node(); virtual void AppendIntersectingRecords(const Rect& query_rect, - Records* records_out) const OVERRIDE; - virtual scoped_ptr<NodeBase> RemoveAndReturnLastChild() OVERRIDE; - virtual int Level() const OVERRIDE; - virtual void AppendAllRecords(Records* matches_out) const OVERRIDE; + Records* records_out) const override; + virtual scoped_ptr<NodeBase> RemoveAndReturnLastChild() override; + virtual int Level() const override; + virtual void AppendAllRecords(Records* matches_out) const override; // Constructs a new Node that is the parent of this Node and already has // this Node as its sole child. Valid to call only on root Nodes, meaning @@ -219,7 +219,7 @@ class GFX_EXPORT RTreeBase { Rects* vertical_bounds, Rects* horizontal_bounds); - virtual void RecomputeLocalBounds() OVERRIDE; + virtual void RecomputeLocalBounds() override; // Returns the increase in overlap value, as defined in Beckmann et al. as // the sum of the areas of the intersection of all child rectangles diff --git a/ui/gfx/icon_util_unittest.cc b/ui/gfx/icon_util_unittest.cc index f0f2cde..280c25f 100644 --- a/ui/gfx/icon_util_unittest.cc +++ b/ui/gfx/icon_util_unittest.cc @@ -26,7 +26,7 @@ static const char kTempIconFilename[] = "temp_test_icon.ico"; class IconUtilTest : public testing::Test { public: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { gfx::RegisterPathProvider(); ASSERT_TRUE(PathService::Get(gfx::DIR_TEST_DATA, &test_data_directory_)); temp_directory_.CreateUniqueTempDir(); diff --git a/ui/gfx/image/canvas_image_source.h b/ui/gfx/image/canvas_image_source.h index 0ce170d..33d97cb 100644 --- a/ui/gfx/image/canvas_image_source.h +++ b/ui/gfx/image/canvas_image_source.h @@ -30,7 +30,7 @@ class GFX_EXPORT CanvasImageSource : public gfx::ImageSkiaSource { const gfx::Size& size() const { return size_; }; // Overridden from gfx::ImageSkiaSource. - virtual gfx::ImageSkiaRep GetImageForScale(float scale) OVERRIDE; + virtual gfx::ImageSkiaRep GetImageForScale(float scale) override; protected: virtual ~CanvasImageSource() {} diff --git a/ui/gfx/image/image.cc b/ui/gfx/image/image.cc index 70ab5ed..bd8cb20 100644 --- a/ui/gfx/image/image.cc +++ b/ui/gfx/image/image.cc @@ -68,7 +68,7 @@ class PNGImageSource : public ImageSkiaSource { PNGImageSource() {} virtual ~PNGImageSource() {} - virtual ImageSkiaRep GetImageForScale(float scale) OVERRIDE { + virtual ImageSkiaRep GetImageForScale(float scale) override { if (image_skia_reps_.empty()) return ImageSkiaRep(); @@ -224,15 +224,15 @@ class ImageRepPNG : public ImageRep { virtual ~ImageRepPNG() { } - virtual int Width() const OVERRIDE { + virtual int Width() const override { return Size().width(); } - virtual int Height() const OVERRIDE { + virtual int Height() const override { return Size().height(); } - virtual gfx::Size Size() const OVERRIDE { + virtual gfx::Size Size() const override { // Read the PNG data to get the image size, caching it. if (!size_cache_) { for (std::vector<ImagePNGRep>::const_iterator it = image_reps().begin(); @@ -270,15 +270,15 @@ class ImageRepSkia : public ImageRep { virtual ~ImageRepSkia() { } - virtual int Width() const OVERRIDE { + virtual int Width() const override { return image_->width(); } - virtual int Height() const OVERRIDE { + virtual int Height() const override { return image_->height(); } - virtual gfx::Size Size() const OVERRIDE { + virtual gfx::Size Size() const override { return image_->size(); } @@ -304,15 +304,15 @@ class ImageRepCocoaTouch : public ImageRep { image_ = nil; } - virtual int Width() const OVERRIDE { + virtual int Width() const override { return Size().width(); } - virtual int Height() const OVERRIDE { + virtual int Height() const override { return Size().height(); } - virtual gfx::Size Size() const OVERRIDE { + virtual gfx::Size Size() const override { return internal::UIImageSize(image_); } @@ -337,15 +337,15 @@ class ImageRepCocoa : public ImageRep { image_ = nil; } - virtual int Width() const OVERRIDE { + virtual int Width() const override { return Size().width(); } - virtual int Height() const OVERRIDE { + virtual int Height() const override { return Size().height(); } - virtual gfx::Size Size() const OVERRIDE { + virtual gfx::Size Size() const override { return internal::NSImageSize(image_); } diff --git a/ui/gfx/image/image_family_unittest.cc b/ui/gfx/image/image_family_unittest.cc index 2e80ccf..f9dd401 100644 --- a/ui/gfx/image/image_family_unittest.cc +++ b/ui/gfx/image/image_family_unittest.cc @@ -26,7 +26,7 @@ do { \ class ImageFamilyTest : public testing::Test { public: // Construct an ImageFamily. Implicitly tests Add and Empty. - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { EXPECT_TRUE(image_family_.empty()); // Aspect ratio 1:1. diff --git a/ui/gfx/image/image_ios_unittest.mm b/ui/gfx/image/image_ios_unittest.mm index 81bd82e..789fe72 100644 --- a/ui/gfx/image/image_ios_unittest.mm +++ b/ui/gfx/image/image_ios_unittest.mm @@ -48,11 +48,11 @@ class ImageIOSTest : public testing::Test { ImageIOSTest() {} virtual ~ImageIOSTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { original_scale_factors_ = gfx::ImageSkia::GetSupportedScales(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { gfx::ImageSkia::SetSupportedScales(original_scale_factors_); } diff --git a/ui/gfx/image/image_skia_operations.cc b/ui/gfx/image/image_skia_operations.cc index c7e0eec..d172d54 100644 --- a/ui/gfx/image/image_skia_operations.cc +++ b/ui/gfx/image/image_skia_operations.cc @@ -58,7 +58,7 @@ class BinaryImageSource : public gfx::ImageSkiaSource { } // gfx::ImageSkiaSource overrides: - virtual ImageSkiaRep GetImageForScale(float scale) OVERRIDE { + virtual ImageSkiaRep GetImageForScale(float scale) override { ImageSkiaRep first_rep = first_.GetRepresentation(scale); ImageSkiaRep second_rep = second_.GetRepresentation(scale); if (first_rep.pixel_size() != second_rep.pixel_size()) { @@ -112,7 +112,7 @@ class BlendingImageSource : public BinaryImageSource { // BinaryImageSource overrides: virtual ImageSkiaRep CreateImageSkiaRep( const ImageSkiaRep& first_rep, - const ImageSkiaRep& second_rep) const OVERRIDE { + const ImageSkiaRep& second_rep) const override { SkBitmap blended = SkBitmapOperations::CreateBlendedBitmap( first_rep.sk_bitmap(), second_rep.sk_bitmap(), alpha_); return ImageSkiaRep(blended, first_rep.scale()); @@ -136,7 +136,7 @@ class SuperimposedImageSource : public gfx::CanvasImageSource { virtual ~SuperimposedImageSource() {} // gfx::CanvasImageSource override. - virtual void Draw(Canvas* canvas) OVERRIDE { + virtual void Draw(Canvas* canvas) override { canvas->DrawImageInt(first_, 0, 0); canvas->DrawImageInt(second_, (first_.width() - second_.width()) / 2, @@ -161,7 +161,7 @@ class TransparentImageSource : public gfx::ImageSkiaSource { private: // gfx::ImageSkiaSource overrides: - virtual ImageSkiaRep GetImageForScale(float scale) OVERRIDE { + virtual ImageSkiaRep GetImageForScale(float scale) override { ImageSkiaRep image_rep = image_.GetRepresentation(scale); SkBitmap alpha; alpha.allocN32Pixels(image_rep.pixel_width(), @@ -190,7 +190,7 @@ class MaskedImageSource : public BinaryImageSource { // BinaryImageSource overrides: virtual ImageSkiaRep CreateImageSkiaRep( const ImageSkiaRep& first_rep, - const ImageSkiaRep& second_rep) const OVERRIDE { + const ImageSkiaRep& second_rep) const override { return ImageSkiaRep(SkBitmapOperations::CreateMaskedBitmap( first_rep.sk_bitmap(), second_rep.sk_bitmap()), first_rep.scale()); @@ -216,7 +216,7 @@ class TiledImageSource : public gfx::ImageSkiaSource { } // gfx::ImageSkiaSource overrides: - virtual ImageSkiaRep GetImageForScale(float scale) OVERRIDE { + virtual ImageSkiaRep GetImageForScale(float scale) override { ImageSkiaRep source_rep = source_.GetRepresentation(scale); gfx::Rect bounds = DIPToPixelBounds(gfx::Rect(src_x_, src_y_, dst_w_, dst_h_), source_rep.scale()); @@ -249,7 +249,7 @@ class HSLImageSource : public gfx::ImageSkiaSource { } // gfx::ImageSkiaSource overrides: - virtual ImageSkiaRep GetImageForScale(float scale) OVERRIDE { + virtual ImageSkiaRep GetImageForScale(float scale) override { ImageSkiaRep image_rep = image_.GetRepresentation(scale); return gfx::ImageSkiaRep( SkBitmapOperations::CreateHSLShiftedBitmap(image_rep.sk_bitmap(), @@ -279,7 +279,7 @@ class ButtonImageSource: public gfx::ImageSkiaSource { } // gfx::ImageSkiaSource overrides: - virtual ImageSkiaRep GetImageForScale(float scale) OVERRIDE { + virtual ImageSkiaRep GetImageForScale(float scale) override { ImageSkiaRep image_rep = image_.GetRepresentation(scale); ImageSkiaRep mask_rep = mask_.GetRepresentation(scale); if (image_rep.scale() != mask_rep.scale()) { @@ -314,7 +314,7 @@ class ExtractSubsetImageSource: public gfx::ImageSkiaSource { } // gfx::ImageSkiaSource overrides: - virtual ImageSkiaRep GetImageForScale(float scale) OVERRIDE { + virtual ImageSkiaRep GetImageForScale(float scale) override { ImageSkiaRep image_rep = image_.GetRepresentation(scale); SkIRect subset_bounds_in_pixel = RectToSkIRect( DIPToPixelBounds(subset_bounds_, image_rep.scale())); @@ -346,7 +346,7 @@ class ResizeSource : public ImageSkiaSource { virtual ~ResizeSource() {} // gfx::ImageSkiaSource overrides: - virtual ImageSkiaRep GetImageForScale(float scale) OVERRIDE { + virtual ImageSkiaRep GetImageForScale(float scale) override { const ImageSkiaRep& image_rep = source_.GetRepresentation(scale); if (image_rep.GetWidth() == target_dip_size_.width() && image_rep.GetHeight() == target_dip_size_.height()) @@ -381,7 +381,7 @@ class DropShadowSource : public ImageSkiaSource { virtual ~DropShadowSource() {} // gfx::ImageSkiaSource overrides: - virtual ImageSkiaRep GetImageForScale(float scale) OVERRIDE { + virtual ImageSkiaRep GetImageForScale(float scale) override { const ImageSkiaRep& image_rep = source_.GetRepresentation(scale); ShadowValues shadows_in_pixel; @@ -413,7 +413,7 @@ class RotatedSource : public ImageSkiaSource { virtual ~RotatedSource() {} // gfx::ImageSkiaSource overrides: - virtual ImageSkiaRep GetImageForScale(float scale) OVERRIDE { + virtual ImageSkiaRep GetImageForScale(float scale) override { const ImageSkiaRep& image_rep = source_.GetRepresentation(scale); const SkBitmap rotated_bitmap = SkBitmapOperations::Rotate(image_rep.sk_bitmap(), rotation_); diff --git a/ui/gfx/interpolated_transform.h b/ui/gfx/interpolated_transform.h index dea9ce9..6b7d0aa 100644 --- a/ui/gfx/interpolated_transform.h +++ b/ui/gfx/interpolated_transform.h @@ -94,7 +94,7 @@ class GFX_EXPORT InterpolatedRotation : public InterpolatedTransform { virtual ~InterpolatedRotation(); protected: - virtual gfx::Transform InterpolateButDoNotCompose(float t) const OVERRIDE; + virtual gfx::Transform InterpolateButDoNotCompose(float t) const override; private: const float start_degrees_; @@ -122,7 +122,7 @@ class GFX_EXPORT InterpolatedAxisAngleRotation : public InterpolatedTransform { virtual ~InterpolatedAxisAngleRotation(); protected: - virtual gfx::Transform InterpolateButDoNotCompose(float t) const OVERRIDE; + virtual gfx::Transform InterpolateButDoNotCompose(float t) const override; private: gfx::Vector3dF axis_; @@ -152,7 +152,7 @@ class GFX_EXPORT InterpolatedScale : public InterpolatedTransform { virtual ~InterpolatedScale(); protected: - virtual gfx::Transform InterpolateButDoNotCompose(float t) const OVERRIDE; + virtual gfx::Transform InterpolateButDoNotCompose(float t) const override; private: const gfx::Point3F start_scale_; @@ -172,7 +172,7 @@ class GFX_EXPORT InterpolatedTranslation : public InterpolatedTransform { virtual ~InterpolatedTranslation(); protected: - virtual gfx::Transform InterpolateButDoNotCompose(float t) const OVERRIDE; + virtual gfx::Transform InterpolateButDoNotCompose(float t) const override; private: const gfx::Point start_pos_; @@ -196,7 +196,7 @@ class GFX_EXPORT InterpolatedConstantTransform : public InterpolatedTransform { virtual ~InterpolatedConstantTransform(); protected: - virtual gfx::Transform InterpolateButDoNotCompose(float t) const OVERRIDE; + virtual gfx::Transform InterpolateButDoNotCompose(float t) const override; private: const gfx::Transform transform_; @@ -227,7 +227,7 @@ class GFX_EXPORT InterpolatedTransformAboutPivot virtual ~InterpolatedTransformAboutPivot(); protected: - virtual gfx::Transform InterpolateButDoNotCompose(float t) const OVERRIDE; + virtual gfx::Transform InterpolateButDoNotCompose(float t) const override; private: void Init(const gfx::Point& pivot, InterpolatedTransform* transform); @@ -250,7 +250,7 @@ class GFX_EXPORT InterpolatedMatrixTransform : public InterpolatedTransform { virtual ~InterpolatedMatrixTransform(); protected: - virtual gfx::Transform InterpolateButDoNotCompose(float t) const OVERRIDE; + virtual gfx::Transform InterpolateButDoNotCompose(float t) const override; private: void Init(const gfx::Transform& start_transform, diff --git a/ui/gfx/mac/coordinate_conversion_unittest.mm b/ui/gfx/mac/coordinate_conversion_unittest.mm index a96bb04..ea0898d 100644 --- a/ui/gfx/mac/coordinate_conversion_unittest.mm +++ b/ui/gfx/mac/coordinate_conversion_unittest.mm @@ -35,8 +35,8 @@ class MacCoordinateConversionTest : public PlatformTest { MacCoordinateConversionTest() {} // Overridden from testing::Test: - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; private: scoped_ptr<base::mac::ScopedObjCClassSwizzler> swizzle_frame_; diff --git a/ui/gfx/platform_font_ios.h b/ui/gfx/platform_font_ios.h index 1d287c3..bb0aeaa 100644 --- a/ui/gfx/platform_font_ios.h +++ b/ui/gfx/platform_font_ios.h @@ -17,17 +17,17 @@ class PlatformFontIOS : public PlatformFont { int font_size); // Overridden from PlatformFont: - virtual Font DeriveFont(int size_delta, int style) const OVERRIDE; - virtual int GetHeight() const OVERRIDE; - virtual int GetBaseline() const OVERRIDE; - virtual int GetCapHeight() const OVERRIDE; - virtual int GetExpectedTextWidth(int length) const OVERRIDE; - virtual int GetStyle() const OVERRIDE; - virtual std::string GetFontName() const OVERRIDE; - virtual std::string GetActualFontNameForTesting() const OVERRIDE; - virtual int GetFontSize() const OVERRIDE; - virtual const FontRenderParams& GetFontRenderParams() const OVERRIDE; - virtual NativeFont GetNativeFont() const OVERRIDE; + virtual Font DeriveFont(int size_delta, int style) const override; + virtual int GetHeight() const override; + virtual int GetBaseline() const override; + virtual int GetCapHeight() const override; + virtual int GetExpectedTextWidth(int length) const override; + virtual int GetStyle() const override; + virtual std::string GetFontName() const override; + virtual std::string GetActualFontNameForTesting() const override; + virtual int GetFontSize() const override; + virtual const FontRenderParams& GetFontRenderParams() const override; + virtual NativeFont GetNativeFont() const override; private: PlatformFontIOS(const std::string& font_name, int font_size, int style); diff --git a/ui/gfx/platform_font_mac.h b/ui/gfx/platform_font_mac.h index 6def51a..05c1249 100644 --- a/ui/gfx/platform_font_mac.h +++ b/ui/gfx/platform_font_mac.h @@ -19,17 +19,17 @@ class PlatformFontMac : public PlatformFont { int font_size); // Overridden from PlatformFont: - virtual Font DeriveFont(int size_delta, int style) const OVERRIDE; - virtual int GetHeight() const OVERRIDE; - virtual int GetBaseline() const OVERRIDE; - virtual int GetCapHeight() const OVERRIDE; - virtual int GetExpectedTextWidth(int length) const OVERRIDE; - virtual int GetStyle() const OVERRIDE; - virtual std::string GetFontName() const OVERRIDE; - virtual std::string GetActualFontNameForTesting() const OVERRIDE; - virtual int GetFontSize() const OVERRIDE; - virtual const FontRenderParams& GetFontRenderParams() const OVERRIDE; - virtual NativeFont GetNativeFont() const OVERRIDE; + virtual Font DeriveFont(int size_delta, int style) const override; + virtual int GetHeight() const override; + virtual int GetBaseline() const override; + virtual int GetCapHeight() const override; + virtual int GetExpectedTextWidth(int length) const override; + virtual int GetStyle() const override; + virtual std::string GetFontName() const override; + virtual std::string GetActualFontNameForTesting() const override; + virtual int GetFontSize() const override; + virtual const FontRenderParams& GetFontRenderParams() const override; + virtual NativeFont GetNativeFont() const override; private: PlatformFontMac(const std::string& font_name, int font_size, int font_style); diff --git a/ui/gfx/platform_font_pango.h b/ui/gfx/platform_font_pango.h index a636db2..5041bbb 100644 --- a/ui/gfx/platform_font_pango.h +++ b/ui/gfx/platform_font_pango.h @@ -41,17 +41,17 @@ class GFX_EXPORT PlatformFontPango : public PlatformFont { #endif // Overridden from PlatformFont: - virtual Font DeriveFont(int size_delta, int style) const OVERRIDE; - virtual int GetHeight() const OVERRIDE; - virtual int GetBaseline() const OVERRIDE; - virtual int GetCapHeight() const OVERRIDE; - virtual int GetExpectedTextWidth(int length) const OVERRIDE; - virtual int GetStyle() const OVERRIDE; - virtual std::string GetFontName() const OVERRIDE; - virtual std::string GetActualFontNameForTesting() const OVERRIDE; - virtual int GetFontSize() const OVERRIDE; - virtual const FontRenderParams& GetFontRenderParams() const OVERRIDE; - virtual NativeFont GetNativeFont() const OVERRIDE; + virtual Font DeriveFont(int size_delta, int style) const override; + virtual int GetHeight() const override; + virtual int GetBaseline() const override; + virtual int GetCapHeight() const override; + virtual int GetExpectedTextWidth(int length) const override; + virtual int GetStyle() const override; + virtual std::string GetFontName() const override; + virtual std::string GetActualFontNameForTesting() const override; + virtual int GetFontSize() const override; + virtual const FontRenderParams& GetFontRenderParams() const override; + virtual NativeFont GetNativeFont() const override; private: // Create a new instance of this object with the specified properties. Called diff --git a/ui/gfx/platform_font_win.h b/ui/gfx/platform_font_win.h index 1434fe6..90160aa 100644 --- a/ui/gfx/platform_font_win.h +++ b/ui/gfx/platform_font_win.h @@ -54,17 +54,17 @@ class GFX_EXPORT PlatformFontWin : public PlatformFont { Font DeriveFontWithHeight(int height, int style); // Overridden from PlatformFont: - virtual Font DeriveFont(int size_delta, int style) const OVERRIDE; - virtual int GetHeight() const OVERRIDE; - virtual int GetBaseline() const OVERRIDE; - virtual int GetCapHeight() const OVERRIDE; - virtual int GetExpectedTextWidth(int length) const OVERRIDE; - virtual int GetStyle() const OVERRIDE; - virtual std::string GetFontName() const OVERRIDE; - virtual std::string GetActualFontNameForTesting() const OVERRIDE; - virtual int GetFontSize() const OVERRIDE; - virtual const FontRenderParams& GetFontRenderParams() const OVERRIDE; - virtual NativeFont GetNativeFont() const OVERRIDE; + virtual Font DeriveFont(int size_delta, int style) const override; + virtual int GetHeight() const override; + virtual int GetBaseline() const override; + virtual int GetCapHeight() const override; + virtual int GetExpectedTextWidth(int length) const override; + virtual int GetStyle() const override; + virtual std::string GetFontName() const override; + virtual std::string GetActualFontNameForTesting() const override; + virtual int GetFontSize() const override; + virtual const FontRenderParams& GetFontRenderParams() const override; + virtual NativeFont GetNativeFont() const override; private: virtual ~PlatformFontWin() {} diff --git a/ui/gfx/render_text_harfbuzz.h b/ui/gfx/render_text_harfbuzz.h index 8936e53..329be9f 100644 --- a/ui/gfx/render_text_harfbuzz.h +++ b/ui/gfx/render_text_harfbuzz.h @@ -80,28 +80,28 @@ class GFX_EXPORT RenderTextHarfBuzz : public RenderText { virtual ~RenderTextHarfBuzz(); // Overridden from RenderText. - virtual Size GetStringSize() OVERRIDE; - virtual SizeF GetStringSizeF() OVERRIDE; - virtual SelectionModel FindCursorPosition(const Point& point) OVERRIDE; - virtual std::vector<FontSpan> GetFontSpansForTesting() OVERRIDE; - virtual Range GetGlyphBounds(size_t index) OVERRIDE; + virtual Size GetStringSize() override; + virtual SizeF GetStringSizeF() override; + virtual SelectionModel FindCursorPosition(const Point& point) override; + virtual std::vector<FontSpan> GetFontSpansForTesting() override; + virtual Range GetGlyphBounds(size_t index) override; protected: // Overridden from RenderText. - virtual int GetLayoutTextBaseline() OVERRIDE; + virtual int GetLayoutTextBaseline() override; virtual SelectionModel AdjacentCharSelectionModel( const SelectionModel& selection, - VisualCursorDirection direction) OVERRIDE; + VisualCursorDirection direction) override; virtual SelectionModel AdjacentWordSelectionModel( const SelectionModel& selection, - VisualCursorDirection direction) OVERRIDE; - virtual std::vector<Rect> GetSubstringBounds(const Range& range) OVERRIDE; - virtual size_t TextIndexToLayoutIndex(size_t index) const OVERRIDE; - virtual size_t LayoutIndexToTextIndex(size_t index) const OVERRIDE; - virtual bool IsValidCursorIndex(size_t index) OVERRIDE; - virtual void ResetLayout() OVERRIDE; - virtual void EnsureLayout() OVERRIDE; - virtual void DrawVisualText(Canvas* canvas) OVERRIDE; + VisualCursorDirection direction) override; + virtual std::vector<Rect> GetSubstringBounds(const Range& range) override; + virtual size_t TextIndexToLayoutIndex(size_t index) const override; + virtual size_t LayoutIndexToTextIndex(size_t index) const override; + virtual bool IsValidCursorIndex(size_t index) override; + virtual void ResetLayout() override; + virtual void EnsureLayout() override; + virtual void DrawVisualText(Canvas* canvas) override; private: friend class RenderTextTest; diff --git a/ui/gfx/render_text_mac.h b/ui/gfx/render_text_mac.h index ad03b84..f69bedb 100644 --- a/ui/gfx/render_text_mac.h +++ b/ui/gfx/render_text_mac.h @@ -26,28 +26,28 @@ class RenderTextMac : public RenderText { virtual ~RenderTextMac(); // Overridden from RenderText: - virtual Size GetStringSize() OVERRIDE; - virtual SizeF GetStringSizeF() OVERRIDE; - virtual SelectionModel FindCursorPosition(const Point& point) OVERRIDE; - virtual std::vector<FontSpan> GetFontSpansForTesting() OVERRIDE; + virtual Size GetStringSize() override; + virtual SizeF GetStringSizeF() override; + virtual SelectionModel FindCursorPosition(const Point& point) override; + virtual std::vector<FontSpan> GetFontSpansForTesting() override; protected: // Overridden from RenderText: - virtual int GetLayoutTextBaseline() OVERRIDE; + virtual int GetLayoutTextBaseline() override; virtual SelectionModel AdjacentCharSelectionModel( const SelectionModel& selection, - VisualCursorDirection direction) OVERRIDE; + VisualCursorDirection direction) override; virtual SelectionModel AdjacentWordSelectionModel( const SelectionModel& selection, - VisualCursorDirection direction) OVERRIDE; - virtual Range GetGlyphBounds(size_t index) OVERRIDE; - virtual std::vector<Rect> GetSubstringBounds(const Range& range) OVERRIDE; - virtual size_t TextIndexToLayoutIndex(size_t index) const OVERRIDE; - virtual size_t LayoutIndexToTextIndex(size_t index) const OVERRIDE; - virtual bool IsValidCursorIndex(size_t index) OVERRIDE; - virtual void ResetLayout() OVERRIDE; - virtual void EnsureLayout() OVERRIDE; - virtual void DrawVisualText(Canvas* canvas) OVERRIDE; + VisualCursorDirection direction) override; + virtual Range GetGlyphBounds(size_t index) override; + virtual std::vector<Rect> GetSubstringBounds(const Range& range) override; + virtual size_t TextIndexToLayoutIndex(size_t index) const override; + virtual size_t LayoutIndexToTextIndex(size_t index) const override; + virtual bool IsValidCursorIndex(size_t index) override; + virtual void ResetLayout() override; + virtual void EnsureLayout() override; + virtual void DrawVisualText(Canvas* canvas) override; private: struct TextRun { diff --git a/ui/gfx/render_text_pango.h b/ui/gfx/render_text_pango.h index 4c62e0a..9e4c55c 100644 --- a/ui/gfx/render_text_pango.h +++ b/ui/gfx/render_text_pango.h @@ -19,27 +19,27 @@ class RenderTextPango : public RenderText { virtual ~RenderTextPango(); // Overridden from RenderText: - virtual Size GetStringSize() OVERRIDE; - virtual SelectionModel FindCursorPosition(const Point& point) OVERRIDE; - virtual std::vector<FontSpan> GetFontSpansForTesting() OVERRIDE; + virtual Size GetStringSize() override; + virtual SelectionModel FindCursorPosition(const Point& point) override; + virtual std::vector<FontSpan> GetFontSpansForTesting() override; protected: // Overridden from RenderText: - virtual int GetLayoutTextBaseline() OVERRIDE; + virtual int GetLayoutTextBaseline() override; virtual SelectionModel AdjacentCharSelectionModel( const SelectionModel& selection, - VisualCursorDirection direction) OVERRIDE; + VisualCursorDirection direction) override; virtual SelectionModel AdjacentWordSelectionModel( const SelectionModel& selection, - VisualCursorDirection direction) OVERRIDE; - virtual Range GetGlyphBounds(size_t index) OVERRIDE; - virtual std::vector<Rect> GetSubstringBounds(const Range& range) OVERRIDE; - virtual size_t TextIndexToLayoutIndex(size_t index) const OVERRIDE; - virtual size_t LayoutIndexToTextIndex(size_t index) const OVERRIDE; - virtual bool IsValidCursorIndex(size_t index) OVERRIDE; - virtual void ResetLayout() OVERRIDE; - virtual void EnsureLayout() OVERRIDE; - virtual void DrawVisualText(Canvas* canvas) OVERRIDE; + VisualCursorDirection direction) override; + virtual Range GetGlyphBounds(size_t index) override; + virtual std::vector<Rect> GetSubstringBounds(const Range& range) override; + virtual size_t TextIndexToLayoutIndex(size_t index) const override; + virtual size_t LayoutIndexToTextIndex(size_t index) const override; + virtual bool IsValidCursorIndex(size_t index) override; + virtual void ResetLayout() override; + virtual void EnsureLayout() override; + virtual void DrawVisualText(Canvas* canvas) override; private: friend class RenderTextTest; diff --git a/ui/gfx/render_text_win.h b/ui/gfx/render_text_win.h index bfe3793..aaf3a1e 100644 --- a/ui/gfx/render_text_win.h +++ b/ui/gfx/render_text_win.h @@ -63,27 +63,27 @@ class RenderTextWin : public RenderText { virtual ~RenderTextWin(); // Overridden from RenderText: - virtual Size GetStringSize() OVERRIDE; - virtual SelectionModel FindCursorPosition(const Point& point) OVERRIDE; - virtual std::vector<FontSpan> GetFontSpansForTesting() OVERRIDE; + virtual Size GetStringSize() override; + virtual SelectionModel FindCursorPosition(const Point& point) override; + virtual std::vector<FontSpan> GetFontSpansForTesting() override; protected: // Overridden from RenderText: - virtual int GetLayoutTextBaseline() OVERRIDE; + virtual int GetLayoutTextBaseline() override; virtual SelectionModel AdjacentCharSelectionModel( const SelectionModel& selection, - VisualCursorDirection direction) OVERRIDE; + VisualCursorDirection direction) override; virtual SelectionModel AdjacentWordSelectionModel( const SelectionModel& selection, - VisualCursorDirection direction) OVERRIDE; - virtual Range GetGlyphBounds(size_t index) OVERRIDE; - virtual std::vector<Rect> GetSubstringBounds(const Range& range) OVERRIDE; - virtual size_t TextIndexToLayoutIndex(size_t index) const OVERRIDE; - virtual size_t LayoutIndexToTextIndex(size_t index) const OVERRIDE; - virtual bool IsValidCursorIndex(size_t index) OVERRIDE; - virtual void ResetLayout() OVERRIDE; - virtual void EnsureLayout() OVERRIDE; - virtual void DrawVisualText(Canvas* canvas) OVERRIDE; + VisualCursorDirection direction) override; + virtual Range GetGlyphBounds(size_t index) override; + virtual std::vector<Rect> GetSubstringBounds(const Range& range) override; + virtual size_t TextIndexToLayoutIndex(size_t index) const override; + virtual size_t LayoutIndexToTextIndex(size_t index) const override; + virtual bool IsValidCursorIndex(size_t index) override; + virtual void ResetLayout() override; + virtual void EnsureLayout() override; + virtual void DrawVisualText(Canvas* canvas) override; private: FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Win_BreakRunsByUnicodeBlocks); diff --git a/ui/gfx/screen_android.cc b/ui/gfx/screen_android.cc index 31e3baa..4f04353 100644 --- a/ui/gfx/screen_android.cc +++ b/ui/gfx/screen_android.cc @@ -15,22 +15,22 @@ class ScreenAndroid : public Screen { public: ScreenAndroid() {} - virtual bool IsDIPEnabled() OVERRIDE { return true; } + virtual bool IsDIPEnabled() override { return true; } - virtual gfx::Point GetCursorScreenPoint() OVERRIDE { return gfx::Point(); } + virtual gfx::Point GetCursorScreenPoint() override { return gfx::Point(); } - virtual gfx::NativeWindow GetWindowUnderCursor() OVERRIDE { + virtual gfx::NativeWindow GetWindowUnderCursor() override { NOTIMPLEMENTED(); return NULL; } virtual gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) - OVERRIDE { + override { NOTIMPLEMENTED(); return NULL; } - virtual gfx::Display GetPrimaryDisplay() const OVERRIDE { + virtual gfx::Display GetPrimaryDisplay() const override { gfx::DeviceDisplayInfo device_info; const float device_scale_factor = device_info.GetDIPScale(); // Note: GetPhysicalDisplayWidth/Height() does not subtract window @@ -54,31 +54,31 @@ class ScreenAndroid : public Screen { } virtual gfx::Display GetDisplayNearestWindow( - gfx::NativeView view) const OVERRIDE { + gfx::NativeView view) const override { return GetPrimaryDisplay(); } virtual gfx::Display GetDisplayNearestPoint( - const gfx::Point& point) const OVERRIDE { + const gfx::Point& point) const override { return GetPrimaryDisplay(); } - virtual int GetNumDisplays() const OVERRIDE { return 1; } + virtual int GetNumDisplays() const override { return 1; } - virtual std::vector<gfx::Display> GetAllDisplays() const OVERRIDE { + virtual std::vector<gfx::Display> GetAllDisplays() const override { return std::vector<gfx::Display>(1, GetPrimaryDisplay()); } virtual gfx::Display GetDisplayMatching( - const gfx::Rect& match_rect) const OVERRIDE { + const gfx::Rect& match_rect) const override { return GetPrimaryDisplay(); } - virtual void AddObserver(DisplayObserver* observer) OVERRIDE { + virtual void AddObserver(DisplayObserver* observer) override { // no display change on Android. } - virtual void RemoveObserver(DisplayObserver* observer) OVERRIDE { + virtual void RemoveObserver(DisplayObserver* observer) override { // no display change on Android. } diff --git a/ui/gfx/screen_ios.mm b/ui/gfx/screen_ios.mm index f630f00a..ac5ccc4 100644 --- a/ui/gfx/screen_ios.mm +++ b/ui/gfx/screen_ios.mm @@ -12,27 +12,27 @@ namespace { class ScreenIos : public gfx::Screen { - virtual bool IsDIPEnabled() OVERRIDE { + virtual bool IsDIPEnabled() override { return true; } - virtual gfx::Point GetCursorScreenPoint() OVERRIDE { + virtual gfx::Point GetCursorScreenPoint() override { NOTIMPLEMENTED(); return gfx::Point(0, 0); } - virtual gfx::NativeWindow GetWindowUnderCursor() OVERRIDE { + virtual gfx::NativeWindow GetWindowUnderCursor() override { NOTIMPLEMENTED(); return gfx::NativeWindow(); } virtual gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) - OVERRIDE { + override { NOTIMPLEMENTED(); return gfx::NativeWindow(); } - virtual int GetNumDisplays() const OVERRIDE { + virtual int GetNumDisplays() const override { #if TARGET_IPHONE_SIMULATOR // UIScreen does not reliably return correct results on the simulator. return 1; @@ -41,34 +41,34 @@ class ScreenIos : public gfx::Screen { #endif } - virtual std::vector<gfx::Display> GetAllDisplays() const OVERRIDE { + virtual std::vector<gfx::Display> GetAllDisplays() const override { NOTIMPLEMENTED(); return std::vector<gfx::Display>(1, GetPrimaryDisplay()); } // Returns the display nearest the specified window. virtual gfx::Display GetDisplayNearestWindow( - gfx::NativeView view) const OVERRIDE { + gfx::NativeView view) const override { NOTIMPLEMENTED(); return gfx::Display(); } // Returns the the display nearest the specified point. virtual gfx::Display GetDisplayNearestPoint( - const gfx::Point& point) const OVERRIDE { + const gfx::Point& point) const override { NOTIMPLEMENTED(); return gfx::Display(); } // Returns the display that most closely intersects the provided bounds. virtual gfx::Display GetDisplayMatching( - const gfx::Rect& match_rect) const OVERRIDE { + const gfx::Rect& match_rect) const override { NOTIMPLEMENTED(); return gfx::Display(); } // Returns the primary display. - virtual gfx::Display GetPrimaryDisplay() const OVERRIDE { + virtual gfx::Display GetPrimaryDisplay() const override { UIScreen* mainScreen = [UIScreen mainScreen]; CHECK(mainScreen); gfx::Display display(0, gfx::Rect(mainScreen.bounds)); @@ -76,11 +76,11 @@ class ScreenIos : public gfx::Screen { return display; } - virtual void AddObserver(gfx::DisplayObserver* observer) OVERRIDE { + virtual void AddObserver(gfx::DisplayObserver* observer) override { // no display change on iOS. } - virtual void RemoveObserver(gfx::DisplayObserver* observer) OVERRIDE { + virtual void RemoveObserver(gfx::DisplayObserver* observer) override { // no display change on iOS. } }; diff --git a/ui/gfx/screen_mac.mm b/ui/gfx/screen_mac.mm index 0b1f41f..c07dd80 100644 --- a/ui/gfx/screen_mac.mm +++ b/ui/gfx/screen_mac.mm @@ -91,11 +91,11 @@ class ScreenMac : public gfx::Screen { ScreenMac::DisplayReconfigurationCallBack, this); } - virtual bool IsDIPEnabled() OVERRIDE { + virtual bool IsDIPEnabled() override { return true; } - virtual gfx::Point GetCursorScreenPoint() OVERRIDE { + virtual gfx::Point GetCursorScreenPoint() override { NSPoint mouseLocation = [NSEvent mouseLocation]; // Flip coordinates to gfx (0,0 in top-left corner) using primary screen. NSScreen* screen = [[NSScreen screens] objectAtIndex:0]; @@ -103,28 +103,28 @@ class ScreenMac : public gfx::Screen { return gfx::Point(mouseLocation.x, mouseLocation.y); } - virtual gfx::NativeWindow GetWindowUnderCursor() OVERRIDE { + virtual gfx::NativeWindow GetWindowUnderCursor() override { NOTIMPLEMENTED(); return gfx::NativeWindow(); } virtual gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) - OVERRIDE { + override { NOTIMPLEMENTED(); return gfx::NativeWindow(); } - virtual int GetNumDisplays() const OVERRIDE { + virtual int GetNumDisplays() const override { return GetAllDisplays().size(); } - virtual std::vector<gfx::Display> GetAllDisplays() const OVERRIDE { + virtual std::vector<gfx::Display> GetAllDisplays() const override { return displays_; } virtual gfx::Display GetDisplayNearestWindow( - gfx::NativeView view) const OVERRIDE { + gfx::NativeView view) const override { NSWindow* window = nil; #if !defined(USE_AURA) if (view) @@ -139,7 +139,7 @@ class ScreenMac : public gfx::Screen { } virtual gfx::Display GetDisplayNearestPoint( - const gfx::Point& point) const OVERRIDE { + const gfx::Point& point) const override { NSPoint ns_point = NSPointFromCGPoint(point.ToCGPoint()); NSArray* screens = [NSScreen screens]; @@ -154,13 +154,13 @@ class ScreenMac : public gfx::Screen { // Returns the display that most closely intersects the provided bounds. virtual gfx::Display GetDisplayMatching( - const gfx::Rect& match_rect) const OVERRIDE { + const gfx::Rect& match_rect) const override { NSScreen* match_screen = GetMatchingScreen(match_rect); return GetDisplayForScreen(match_screen); } // Returns the primary display. - virtual gfx::Display GetPrimaryDisplay() const OVERRIDE { + virtual gfx::Display GetPrimaryDisplay() const override { // Primary display is defined as the display with the menubar, // which is always at index 0. NSScreen* primary = [[NSScreen screens] objectAtIndex:0]; @@ -168,11 +168,11 @@ class ScreenMac : public gfx::Screen { return display; } - virtual void AddObserver(gfx::DisplayObserver* observer) OVERRIDE { + virtual void AddObserver(gfx::DisplayObserver* observer) override { change_notifier_.AddObserver(observer); } - virtual void RemoveObserver(gfx::DisplayObserver* observer) OVERRIDE { + virtual void RemoveObserver(gfx::DisplayObserver* observer) override { change_notifier_.RemoveObserver(observer); } diff --git a/ui/gfx/screen_win.h b/ui/gfx/screen_win.h index 6ca5601..7d7d2b0 100644 --- a/ui/gfx/screen_win.h +++ b/ui/gfx/screen_win.h @@ -21,28 +21,28 @@ class GFX_EXPORT ScreenWin : public Screen, protected: // Overridden from gfx::Screen: - virtual bool IsDIPEnabled() OVERRIDE; - virtual gfx::Point GetCursorScreenPoint() OVERRIDE; - virtual gfx::NativeWindow GetWindowUnderCursor() OVERRIDE; + virtual bool IsDIPEnabled() override; + virtual gfx::Point GetCursorScreenPoint() override; + virtual gfx::NativeWindow GetWindowUnderCursor() override; virtual gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) - OVERRIDE; - virtual int GetNumDisplays() const OVERRIDE; - virtual std::vector<gfx::Display> GetAllDisplays() const OVERRIDE; + override; + virtual int GetNumDisplays() const override; + virtual std::vector<gfx::Display> GetAllDisplays() const override; virtual gfx::Display GetDisplayNearestWindow( - gfx::NativeView window) const OVERRIDE; + gfx::NativeView window) const override; virtual gfx::Display GetDisplayNearestPoint( - const gfx::Point& point) const OVERRIDE; + const gfx::Point& point) const override; virtual gfx::Display GetDisplayMatching( - const gfx::Rect& match_rect) const OVERRIDE; - virtual gfx::Display GetPrimaryDisplay() const OVERRIDE; - virtual void AddObserver(DisplayObserver* observer) OVERRIDE; - virtual void RemoveObserver(DisplayObserver* observer) OVERRIDE; + const gfx::Rect& match_rect) const override; + virtual gfx::Display GetPrimaryDisplay() const override; + virtual void AddObserver(DisplayObserver* observer) override; + virtual void RemoveObserver(DisplayObserver* observer) override; // Overriden from gfx::SingletonHwnd::Observer. virtual void OnWndProc(HWND hwnd, UINT message, WPARAM wparam, - LPARAM lparam) OVERRIDE; + LPARAM lparam) override; // Returns the HWND associated with the NativeView. virtual HWND GetHWNDFromNativeView(NativeView window) const; diff --git a/ui/gfx/sys_color_change_listener.cc b/ui/gfx/sys_color_change_listener.cc index 4a394ae..7f52f89 100644 --- a/ui/gfx/sys_color_change_listener.cc +++ b/ui/gfx/sys_color_change_listener.cc @@ -65,7 +65,7 @@ class SysColorChangeObserver : public gfx::SingletonHwnd::Observer { virtual void OnWndProc(HWND hwnd, UINT message, WPARAM wparam, - LPARAM lparam) OVERRIDE; + LPARAM lparam) override; ObserverList<SysColorChangeListener> listeners_; }; diff --git a/ui/gfx/test/run_all_unittests.cc b/ui/gfx/test/run_all_unittests.cc index 14ceef9..5282da1 100644 --- a/ui/gfx/test/run_all_unittests.cc +++ b/ui/gfx/test/run_all_unittests.cc @@ -24,7 +24,7 @@ class GfxTestSuite : public base::TestSuite { GfxTestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {} protected: - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { base::TestSuite::Initialize(); #if defined(OS_ANDROID) @@ -38,7 +38,7 @@ class GfxTestSuite : public base::TestSuite { ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path); } - virtual void Shutdown() OVERRIDE { + virtual void Shutdown() override { ui::ResourceBundle::CleanupSharedInstance(); base::TestSuite::Shutdown(); } diff --git a/ui/gfx/test/ui_cocoa_test_helper.h b/ui/gfx/test/ui_cocoa_test_helper.h index c75c7bd..faf66dd 100644 --- a/ui/gfx/test/ui_cocoa_test_helper.h +++ b/ui/gfx/test/ui_cocoa_test_helper.h @@ -59,7 +59,7 @@ class CocoaTest : public PlatformTest { // to close them before CocoaTest::TearDown is called. A standard way of doing // this would be to create them in SetUp (after calling CocoaTest::Setup) and // then close them in TearDown before calling CocoaTest::TearDown. - virtual void TearDown() OVERRIDE; + virtual void TearDown() override; // Retuns a test window that can be used by views and other UI objects // as part of their tests. Is created lazily, and will be closed correctly diff --git a/ui/gfx/win/singleton_hwnd.h b/ui/gfx/win/singleton_hwnd.h index 50fb9fd..631da25 100644 --- a/ui/gfx/win/singleton_hwnd.h +++ b/ui/gfx/win/singleton_hwnd.h @@ -42,7 +42,7 @@ class GFX_EXPORT SingletonHwnd : public WindowImpl { WPARAM wparam, LPARAM lparam, LRESULT& result, - DWORD msg_map_id) OVERRIDE; + DWORD msg_map_id) override; private: friend struct DefaultSingletonTraits<SingletonHwnd>; diff --git a/ui/gl/generate_bindings.py b/ui/gl/generate_bindings.py index 75f55c7..bfc03a3 100755 --- a/ui/gl/generate_bindings.py +++ b/ui/gl/generate_bindings.py @@ -1415,7 +1415,7 @@ def GenerateAPIHeader(file, functions, set_name): # Write API declaration. for func in functions: - file.write(' virtual %s %sFn(%s) OVERRIDE;\n' % + file.write(' virtual %s %sFn(%s) override;\n' % (func['return_type'], func['known_as'], func['arguments'])) file.write('\n') diff --git a/ui/gl/gl_context.h b/ui/gl/gl_context.h index 323b373..8e5ecd8 100644 --- a/ui/gl/gl_context.h +++ b/ui/gl/gl_context.h @@ -188,7 +188,7 @@ class GL_EXPORT GLContextReal : public GLContext { protected: virtual ~GLContextReal(); - virtual void SetCurrent(GLSurface* surface) OVERRIDE; + virtual void SetCurrent(GLSurface* surface) override; private: DISALLOW_COPY_AND_ASSIGN(GLContextReal); diff --git a/ui/gl/gl_context_android.cc b/ui/gl/gl_context_android.cc index 51377a3..2d91a65 100644 --- a/ui/gl/gl_context_android.cc +++ b/ui/gl/gl_context_android.cc @@ -27,14 +27,14 @@ class GLNonOwnedContext : public GLContextReal { // Implement GLContext. virtual bool Initialize(GLSurface* compatible_surface, - GpuPreference gpu_preference) OVERRIDE; - virtual void Destroy() OVERRIDE {} - virtual bool MakeCurrent(GLSurface* surface) OVERRIDE; - virtual void ReleaseCurrent(GLSurface* surface) OVERRIDE {} - virtual bool IsCurrent(GLSurface* surface) OVERRIDE { return true; } - virtual void* GetHandle() OVERRIDE { return NULL; } - virtual void SetSwapInterval(int interval) OVERRIDE {} - virtual std::string GetExtensions() OVERRIDE; + GpuPreference gpu_preference) override; + virtual void Destroy() override {} + virtual bool MakeCurrent(GLSurface* surface) override; + virtual void ReleaseCurrent(GLSurface* surface) override {} + virtual bool IsCurrent(GLSurface* surface) override { return true; } + virtual void* GetHandle() override { return NULL; } + virtual void SetSwapInterval(int interval) override {} + virtual std::string GetExtensions() override; protected: virtual ~GLNonOwnedContext() {} diff --git a/ui/gl/gl_context_cgl.h b/ui/gl/gl_context_cgl.h index a83eaaf..5bcb335d 100644 --- a/ui/gl/gl_context_cgl.h +++ b/ui/gl/gl_context_cgl.h @@ -20,15 +20,15 @@ class GLContextCGL : public GLContextReal { // Implement GLContext. virtual bool Initialize(GLSurface* compatible_surface, - GpuPreference gpu_preference) OVERRIDE; - virtual void Destroy() OVERRIDE; - virtual bool MakeCurrent(GLSurface* surface) OVERRIDE; - virtual void ReleaseCurrent(GLSurface* surface) OVERRIDE; - virtual bool IsCurrent(GLSurface* surface) OVERRIDE; - virtual void* GetHandle() OVERRIDE; - virtual void SetSwapInterval(int interval) OVERRIDE; - virtual bool GetTotalGpuMemory(size_t* bytes) OVERRIDE; - virtual void SetSafeToForceGpuSwitch() OVERRIDE; + GpuPreference gpu_preference) override; + virtual void Destroy() override; + virtual bool MakeCurrent(GLSurface* surface) override; + virtual void ReleaseCurrent(GLSurface* surface) override; + virtual bool IsCurrent(GLSurface* surface) override; + virtual void* GetHandle() override; + virtual void SetSwapInterval(int interval) override; + virtual bool GetTotalGpuMemory(size_t* bytes) override; + virtual void SetSafeToForceGpuSwitch() override; protected: virtual ~GLContextCGL(); diff --git a/ui/gl/gl_context_egl.h b/ui/gl/gl_context_egl.h index 9dd9a72..82d15a6 100644 --- a/ui/gl/gl_context_egl.h +++ b/ui/gl/gl_context_egl.h @@ -25,17 +25,17 @@ class GLContextEGL : public GLContextReal { // Implement GLContext. virtual bool Initialize( - GLSurface* compatible_surface, GpuPreference gpu_preference) OVERRIDE; - virtual void Destroy() OVERRIDE; - virtual bool MakeCurrent(GLSurface* surface) OVERRIDE; - virtual void ReleaseCurrent(GLSurface* surface) OVERRIDE; - virtual bool IsCurrent(GLSurface* surface) OVERRIDE; - virtual void* GetHandle() OVERRIDE; - virtual void SetSwapInterval(int interval) OVERRIDE; - virtual std::string GetExtensions() OVERRIDE; - virtual bool WasAllocatedUsingRobustnessExtension() OVERRIDE; - virtual bool GetTotalGpuMemory(size_t* bytes) OVERRIDE; - virtual void SetUnbindFboOnMakeCurrent() OVERRIDE; + GLSurface* compatible_surface, GpuPreference gpu_preference) override; + virtual void Destroy() override; + virtual bool MakeCurrent(GLSurface* surface) override; + virtual void ReleaseCurrent(GLSurface* surface) override; + virtual bool IsCurrent(GLSurface* surface) override; + virtual void* GetHandle() override; + virtual void SetSwapInterval(int interval) override; + virtual std::string GetExtensions() override; + virtual bool WasAllocatedUsingRobustnessExtension() override; + virtual bool GetTotalGpuMemory(size_t* bytes) override; + virtual void SetUnbindFboOnMakeCurrent() override; protected: virtual ~GLContextEGL(); diff --git a/ui/gl/gl_context_glx.h b/ui/gl/gl_context_glx.h index 987a8d8..ca53403 100644 --- a/ui/gl/gl_context_glx.h +++ b/ui/gl/gl_context_glx.h @@ -25,16 +25,16 @@ class GL_EXPORT GLContextGLX : public GLContextReal { // Implement GLContext. virtual bool Initialize( - GLSurface* compatible_surface, GpuPreference gpu_preference) OVERRIDE; - virtual void Destroy() OVERRIDE; - virtual bool MakeCurrent(GLSurface* surface) OVERRIDE; - virtual void ReleaseCurrent(GLSurface* surface) OVERRIDE; - virtual bool IsCurrent(GLSurface* surface) OVERRIDE; - virtual void* GetHandle() OVERRIDE; - virtual void SetSwapInterval(int interval) OVERRIDE; - virtual std::string GetExtensions() OVERRIDE; - virtual bool GetTotalGpuMemory(size_t* bytes) OVERRIDE; - virtual bool WasAllocatedUsingRobustnessExtension() OVERRIDE; + GLSurface* compatible_surface, GpuPreference gpu_preference) override; + virtual void Destroy() override; + virtual bool MakeCurrent(GLSurface* surface) override; + virtual void ReleaseCurrent(GLSurface* surface) override; + virtual bool IsCurrent(GLSurface* surface) override; + virtual void* GetHandle() override; + virtual void SetSwapInterval(int interval) override; + virtual std::string GetExtensions() override; + virtual bool GetTotalGpuMemory(size_t* bytes) override; + virtual bool WasAllocatedUsingRobustnessExtension() override; protected: virtual ~GLContextGLX(); diff --git a/ui/gl/gl_context_osmesa.h b/ui/gl/gl_context_osmesa.h index f78b525..5cac4dec 100644 --- a/ui/gl/gl_context_osmesa.h +++ b/ui/gl/gl_context_osmesa.h @@ -23,13 +23,13 @@ class GLContextOSMesa : public GLContextReal { // Implement GLContext. virtual bool Initialize(GLSurface* compatible_surface, - GpuPreference gpu_preference) OVERRIDE; - virtual void Destroy() OVERRIDE; - virtual bool MakeCurrent(GLSurface* surface) OVERRIDE; - virtual void ReleaseCurrent(GLSurface* surface) OVERRIDE; - virtual bool IsCurrent(GLSurface* surface) OVERRIDE; - virtual void* GetHandle() OVERRIDE; - virtual void SetSwapInterval(int interval) OVERRIDE; + GpuPreference gpu_preference) override; + virtual void Destroy() override; + virtual bool MakeCurrent(GLSurface* surface) override; + virtual void ReleaseCurrent(GLSurface* surface) override; + virtual bool IsCurrent(GLSurface* surface) override; + virtual void* GetHandle() override; + virtual void SetSwapInterval(int interval) override; protected: virtual ~GLContextOSMesa(); diff --git a/ui/gl/gl_context_stub.h b/ui/gl/gl_context_stub.h index d57e02e..c95be1d 100644 --- a/ui/gl/gl_context_stub.h +++ b/ui/gl/gl_context_stub.h @@ -16,15 +16,15 @@ class GL_EXPORT GLContextStub : public GLContextReal { // Implement GLContext. virtual bool Initialize(GLSurface* compatible_surface, - GpuPreference gpu_preference) OVERRIDE; - virtual void Destroy() OVERRIDE; - virtual bool MakeCurrent(GLSurface* surface) OVERRIDE; - virtual void ReleaseCurrent(GLSurface* surface) OVERRIDE; - virtual bool IsCurrent(GLSurface* surface) OVERRIDE; - virtual void* GetHandle() OVERRIDE; - virtual void SetSwapInterval(int interval) OVERRIDE; - virtual std::string GetExtensions() OVERRIDE; - virtual std::string GetGLRenderer() OVERRIDE; + GpuPreference gpu_preference) override; + virtual void Destroy() override; + virtual bool MakeCurrent(GLSurface* surface) override; + virtual void ReleaseCurrent(GLSurface* surface) override; + virtual bool IsCurrent(GLSurface* surface) override; + virtual void* GetHandle() override; + virtual void SetSwapInterval(int interval) override; + virtual std::string GetExtensions() override; + virtual std::string GetGLRenderer() override; protected: virtual ~GLContextStub(); diff --git a/ui/gl/gl_context_stub_with_extensions.h b/ui/gl/gl_context_stub_with_extensions.h index e048990..e701e0d 100644 --- a/ui/gl/gl_context_stub_with_extensions.h +++ b/ui/gl/gl_context_stub_with_extensions.h @@ -15,13 +15,13 @@ namespace gfx { class GL_EXPORT GLContextStubWithExtensions : public gfx::GLContextStub { public: GLContextStubWithExtensions() {} - virtual std::string GetExtensions() OVERRIDE; + virtual std::string GetExtensions() override; void AddExtensionsString(const char* extensions); void SetGLVersionString(const char* version_str); protected: - virtual std::string GetGLVersion() OVERRIDE; + virtual std::string GetGLVersion() override; virtual ~GLContextStubWithExtensions() {} diff --git a/ui/gl/gl_fence_arb.h b/ui/gl/gl_fence_arb.h index db29675..614bfcb 100644 --- a/ui/gl/gl_fence_arb.h +++ b/ui/gl/gl_fence_arb.h @@ -18,9 +18,9 @@ class GL_EXPORT GLFenceARB : public GLFence { virtual ~GLFenceARB(); // GLFence implementation: - virtual bool HasCompleted() OVERRIDE; - virtual void ClientWait() OVERRIDE; - virtual void ServerWait() OVERRIDE; + virtual bool HasCompleted() override; + virtual void ClientWait() override; + virtual void ServerWait() override; private: GLsync sync_; diff --git a/ui/gl/gl_fence_egl.h b/ui/gl/gl_fence_egl.h index 531b3dc..fce6291 100644 --- a/ui/gl/gl_fence_egl.h +++ b/ui/gl/gl_fence_egl.h @@ -18,9 +18,9 @@ class GL_EXPORT GLFenceEGL : public GLFence { virtual ~GLFenceEGL(); // GLFence implementation: - virtual bool HasCompleted() OVERRIDE; - virtual void ClientWait() OVERRIDE; - virtual void ServerWait() OVERRIDE; + virtual bool HasCompleted() override; + virtual void ClientWait() override; + virtual void ServerWait() override; private: EGLSyncKHR sync_; diff --git a/ui/gl/gl_fence_nv.h b/ui/gl/gl_fence_nv.h index fee9eff..c89cc42 100644 --- a/ui/gl/gl_fence_nv.h +++ b/ui/gl/gl_fence_nv.h @@ -18,9 +18,9 @@ class GL_EXPORT GLFenceNV : public GLFence { virtual ~GLFenceNV(); // GLFence implementation: - virtual bool HasCompleted() OVERRIDE; - virtual void ClientWait() OVERRIDE; - virtual void ServerWait() OVERRIDE; + virtual bool HasCompleted() override; + virtual void ClientWait() override; + virtual void ServerWait() override; private: GLuint fence_; diff --git a/ui/gl/gl_gl_api_implementation.h b/ui/gl/gl_gl_api_implementation.h index 22faccd..39f9558 100644 --- a/ui/gl/gl_gl_api_implementation.h +++ b/ui/gl/gl_gl_api_implementation.h @@ -57,8 +57,8 @@ class RealGLApi : public GLApiBase { void Initialize(DriverGL* driver); private: - virtual void glFinishFn() OVERRIDE; - virtual void glFlushFn() OVERRIDE; + virtual void glFinishFn() override; + virtual void glFlushFn() override; }; // Inserts a TRACE for every GL call. @@ -104,9 +104,9 @@ class VirtualGLApi : public GLApiBase { private: // Overridden functions from GLApiBase - virtual const GLubyte* glGetStringFn(GLenum name) OVERRIDE; - virtual void glFinishFn() OVERRIDE; - virtual void glFlushFn() OVERRIDE; + virtual const GLubyte* glGetStringFn(GLenum name) override; + virtual void glFinishFn() override; + virtual void glFlushFn() override; // The real context we're running on. GLContext* real_context_; diff --git a/ui/gl/gl_image_egl.h b/ui/gl/gl_image_egl.h index bade6eb..c1ec1fc 100644 --- a/ui/gl/gl_image_egl.h +++ b/ui/gl/gl_image_egl.h @@ -17,20 +17,20 @@ class GL_EXPORT GLImageEGL : public GLImage { bool Initialize(EGLenum target, EGLClientBuffer buffer, const EGLint* attrs); // Overridden from GLImage: - virtual void Destroy(bool have_context) OVERRIDE; - virtual gfx::Size GetSize() OVERRIDE; - virtual bool BindTexImage(unsigned target) OVERRIDE; - virtual void ReleaseTexImage(unsigned target) OVERRIDE {} - virtual bool CopyTexImage(unsigned target) OVERRIDE; - virtual void WillUseTexImage() OVERRIDE {} - virtual void DidUseTexImage() OVERRIDE {} - virtual void WillModifyTexImage() OVERRIDE {} - virtual void DidModifyTexImage() OVERRIDE {} + virtual void Destroy(bool have_context) override; + virtual gfx::Size GetSize() override; + virtual bool BindTexImage(unsigned target) override; + virtual void ReleaseTexImage(unsigned target) override {} + virtual bool CopyTexImage(unsigned target) override; + virtual void WillUseTexImage() override {} + virtual void DidUseTexImage() override {} + virtual void WillModifyTexImage() override {} + virtual void DidModifyTexImage() override {} virtual bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget, int z_order, OverlayTransform transform, const Rect& bounds_rect, - const RectF& crop_rect) OVERRIDE; + const RectF& crop_rect) override; protected: virtual ~GLImageEGL(); diff --git a/ui/gl/gl_image_glx.h b/ui/gl/gl_image_glx.h index 82cee7d..57c55c56 100644 --- a/ui/gl/gl_image_glx.h +++ b/ui/gl/gl_image_glx.h @@ -19,20 +19,20 @@ class GL_EXPORT GLImageGLX : public GLImage { bool Initialize(XID pixmap); // Overridden from GLImage: - virtual void Destroy(bool have_context) OVERRIDE; - virtual gfx::Size GetSize() OVERRIDE; - virtual bool BindTexImage(unsigned target) OVERRIDE; - virtual void ReleaseTexImage(unsigned target) OVERRIDE; - virtual bool CopyTexImage(unsigned target) OVERRIDE; - virtual void WillUseTexImage() OVERRIDE {} - virtual void DidUseTexImage() OVERRIDE {} - virtual void WillModifyTexImage() OVERRIDE {} - virtual void DidModifyTexImage() OVERRIDE {} + virtual void Destroy(bool have_context) override; + virtual gfx::Size GetSize() override; + virtual bool BindTexImage(unsigned target) override; + virtual void ReleaseTexImage(unsigned target) override; + virtual bool CopyTexImage(unsigned target) override; + virtual void WillUseTexImage() override {} + virtual void DidUseTexImage() override {} + virtual void WillModifyTexImage() override {} + virtual void DidModifyTexImage() override {} virtual bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget, int z_order, OverlayTransform transform, const Rect& bounds_rect, - const RectF& crop_rect) OVERRIDE; + const RectF& crop_rect) override; protected: virtual ~GLImageGLX(); diff --git a/ui/gl/gl_image_io_surface.h b/ui/gl/gl_image_io_surface.h index 262582f..07f3a0c 100644 --- a/ui/gl/gl_image_io_surface.h +++ b/ui/gl/gl_image_io_surface.h @@ -20,20 +20,20 @@ class GL_EXPORT GLImageIOSurface : public GLImage { bool Initialize(IOSurfaceRef io_surface); // Overridden from GLImage: - virtual void Destroy(bool have_context) OVERRIDE; - virtual gfx::Size GetSize() OVERRIDE; - virtual bool BindTexImage(unsigned target) OVERRIDE; - virtual void ReleaseTexImage(unsigned target) OVERRIDE {} - virtual bool CopyTexImage(unsigned target) OVERRIDE; - virtual void WillUseTexImage() OVERRIDE {} - virtual void DidUseTexImage() OVERRIDE {} - virtual void WillModifyTexImage() OVERRIDE {} - virtual void DidModifyTexImage() OVERRIDE {} + virtual void Destroy(bool have_context) override; + virtual gfx::Size GetSize() override; + virtual bool BindTexImage(unsigned target) override; + virtual void ReleaseTexImage(unsigned target) override {} + virtual bool CopyTexImage(unsigned target) override; + virtual void WillUseTexImage() override {} + virtual void DidUseTexImage() override {} + virtual void WillModifyTexImage() override {} + virtual void DidModifyTexImage() override {} virtual bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget, int z_order, OverlayTransform transform, const Rect& bounds_rect, - const RectF& crop_rect) OVERRIDE; + const RectF& crop_rect) override; protected: virtual ~GLImageIOSurface(); diff --git a/ui/gl/gl_image_memory.h b/ui/gl/gl_image_memory.h index 6dbec46..067e4fb 100644 --- a/ui/gl/gl_image_memory.h +++ b/ui/gl/gl_image_memory.h @@ -22,20 +22,20 @@ class GL_EXPORT GLImageMemory : public GLImage { bool Initialize(const unsigned char* memory); // Overridden from GLImage: - virtual void Destroy(bool have_context) OVERRIDE; - virtual gfx::Size GetSize() OVERRIDE; - virtual bool BindTexImage(unsigned target) OVERRIDE; - virtual void ReleaseTexImage(unsigned target) OVERRIDE {} - virtual bool CopyTexImage(unsigned target) OVERRIDE; - virtual void WillUseTexImage() OVERRIDE; - virtual void DidUseTexImage() OVERRIDE; - virtual void WillModifyTexImage() OVERRIDE {} - virtual void DidModifyTexImage() OVERRIDE {} + virtual void Destroy(bool have_context) override; + virtual gfx::Size GetSize() override; + virtual bool BindTexImage(unsigned target) override; + virtual void ReleaseTexImage(unsigned target) override {} + virtual bool CopyTexImage(unsigned target) override; + virtual void WillUseTexImage() override; + virtual void DidUseTexImage() override; + virtual void WillModifyTexImage() override {} + virtual void DidModifyTexImage() override {} virtual bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget, int z_order, OverlayTransform transform, const Rect& bounds_rect, - const RectF& crop_rect) OVERRIDE; + const RectF& crop_rect) override; protected: virtual ~GLImageMemory(); diff --git a/ui/gl/gl_image_ref_counted_memory.h b/ui/gl/gl_image_ref_counted_memory.h index f721f4b..337125d 100644 --- a/ui/gl/gl_image_ref_counted_memory.h +++ b/ui/gl/gl_image_ref_counted_memory.h @@ -21,7 +21,7 @@ class GL_EXPORT GLImageRefCountedMemory : public GLImageMemory { bool Initialize(base::RefCountedMemory* ref_counted_memory); // Overridden from GLImage: - virtual void Destroy(bool have_context) OVERRIDE; + virtual void Destroy(bool have_context) override; protected: virtual ~GLImageRefCountedMemory(); diff --git a/ui/gl/gl_image_shared_memory.h b/ui/gl/gl_image_shared_memory.h index 447475f..7de2189 100644 --- a/ui/gl/gl_image_shared_memory.h +++ b/ui/gl/gl_image_shared_memory.h @@ -18,7 +18,7 @@ class GL_EXPORT GLImageSharedMemory : public GLImageMemory { bool Initialize(const gfx::GpuMemoryBufferHandle& handle); // Overridden from GLImage: - virtual void Destroy(bool have_context) OVERRIDE; + virtual void Destroy(bool have_context) override; protected: virtual ~GLImageSharedMemory(); diff --git a/ui/gl/gl_image_stub.h b/ui/gl/gl_image_stub.h index c8ec8eb..626afea 100644 --- a/ui/gl/gl_image_stub.h +++ b/ui/gl/gl_image_stub.h @@ -15,20 +15,20 @@ class GL_EXPORT GLImageStub : public GLImage { GLImageStub(); // Overridden from GLImage: - virtual void Destroy(bool have_context) OVERRIDE {} - virtual gfx::Size GetSize() OVERRIDE; - virtual bool BindTexImage(unsigned target) OVERRIDE; - virtual void ReleaseTexImage(unsigned target) OVERRIDE {} - virtual bool CopyTexImage(unsigned target) OVERRIDE; - virtual void WillUseTexImage() OVERRIDE {} - virtual void DidUseTexImage() OVERRIDE {} - virtual void WillModifyTexImage() OVERRIDE {} - virtual void DidModifyTexImage() OVERRIDE {} + virtual void Destroy(bool have_context) override {} + virtual gfx::Size GetSize() override; + virtual bool BindTexImage(unsigned target) override; + virtual void ReleaseTexImage(unsigned target) override {} + virtual bool CopyTexImage(unsigned target) override; + virtual void WillUseTexImage() override {} + virtual void DidUseTexImage() override {} + virtual void WillModifyTexImage() override {} + virtual void DidModifyTexImage() override {} virtual bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget, int z_order, OverlayTransform transform, const Rect& bounds_rect, - const RectF& crop_rect) OVERRIDE; + const RectF& crop_rect) override; protected: virtual ~GLImageStub(); diff --git a/ui/gl/gl_image_surface_texture.h b/ui/gl/gl_image_surface_texture.h index b47eb30..245869b 100644 --- a/ui/gl/gl_image_surface_texture.h +++ b/ui/gl/gl_image_surface_texture.h @@ -21,20 +21,20 @@ class GL_EXPORT GLImageSurfaceTexture : public GLImage { bool Initialize(const gfx::GpuMemoryBufferHandle& handle); // Overridden from GLImage: - virtual void Destroy(bool have_context) OVERRIDE; - virtual gfx::Size GetSize() OVERRIDE; - virtual bool BindTexImage(unsigned target) OVERRIDE; - virtual void ReleaseTexImage(unsigned target) OVERRIDE {} - virtual bool CopyTexImage(unsigned target) OVERRIDE; - virtual void WillUseTexImage() OVERRIDE {} - virtual void DidUseTexImage() OVERRIDE {} - virtual void WillModifyTexImage() OVERRIDE {} - virtual void DidModifyTexImage() OVERRIDE {} + virtual void Destroy(bool have_context) override; + virtual gfx::Size GetSize() override; + virtual bool BindTexImage(unsigned target) override; + virtual void ReleaseTexImage(unsigned target) override {} + virtual bool CopyTexImage(unsigned target) override; + virtual void WillUseTexImage() override {} + virtual void DidUseTexImage() override {} + virtual void WillModifyTexImage() override {} + virtual void DidModifyTexImage() override {} virtual bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget, int z_order, OverlayTransform transform, const Rect& bounds_rect, - const RectF& crop_rect) OVERRIDE; + const RectF& crop_rect) override; protected: virtual ~GLImageSurfaceTexture(); diff --git a/ui/gl/gl_surface.h b/ui/gl/gl_surface.h index 3851c1c..7c7a5cec 100644 --- a/ui/gl/gl_surface.h +++ b/ui/gl/gl_surface.h @@ -158,32 +158,32 @@ class GL_EXPORT GLSurfaceAdapter : public GLSurface { public: explicit GLSurfaceAdapter(GLSurface* surface); - virtual bool Initialize() OVERRIDE; - virtual void Destroy() OVERRIDE; - virtual bool Resize(const gfx::Size& size) OVERRIDE; - virtual bool Recreate() OVERRIDE; - virtual bool DeferDraws() OVERRIDE; - virtual bool IsOffscreen() OVERRIDE; - virtual bool SwapBuffers() OVERRIDE; - virtual bool PostSubBuffer(int x, int y, int width, int height) OVERRIDE; - virtual bool SupportsPostSubBuffer() OVERRIDE; - virtual gfx::Size GetSize() OVERRIDE; - virtual void* GetHandle() OVERRIDE; - virtual unsigned int GetBackingFrameBufferObject() OVERRIDE; - virtual bool OnMakeCurrent(GLContext* context) OVERRIDE; - virtual bool SetBackbufferAllocation(bool allocated) OVERRIDE; - virtual void SetFrontbufferAllocation(bool allocated) OVERRIDE; - virtual void* GetShareHandle() OVERRIDE; - virtual void* GetDisplay() OVERRIDE; - virtual void* GetConfig() OVERRIDE; - virtual unsigned GetFormat() OVERRIDE; - virtual VSyncProvider* GetVSyncProvider() OVERRIDE; + virtual bool Initialize() override; + virtual void Destroy() override; + virtual bool Resize(const gfx::Size& size) override; + virtual bool Recreate() override; + virtual bool DeferDraws() override; + virtual bool IsOffscreen() override; + virtual bool SwapBuffers() override; + virtual bool PostSubBuffer(int x, int y, int width, int height) override; + virtual bool SupportsPostSubBuffer() override; + virtual gfx::Size GetSize() override; + virtual void* GetHandle() override; + virtual unsigned int GetBackingFrameBufferObject() override; + virtual bool OnMakeCurrent(GLContext* context) override; + virtual bool SetBackbufferAllocation(bool allocated) override; + virtual void SetFrontbufferAllocation(bool allocated) override; + virtual void* GetShareHandle() override; + virtual void* GetDisplay() override; + virtual void* GetConfig() override; + virtual unsigned GetFormat() override; + virtual VSyncProvider* GetVSyncProvider() override; virtual bool ScheduleOverlayPlane(int z_order, OverlayTransform transform, GLImage* image, const Rect& bounds_rect, - const RectF& crop_rect) OVERRIDE; - virtual bool IsSurfaceless() const OVERRIDE; + const RectF& crop_rect) override; + virtual bool IsSurfaceless() const override; GLSurface* surface() const { return surface_.get(); } diff --git a/ui/gl/gl_surface_egl.cc b/ui/gl/gl_surface_egl.cc index 439401a..b8c29d7 100644 --- a/ui/gl/gl_surface_egl.cc +++ b/ui/gl/gl_surface_egl.cc @@ -79,7 +79,7 @@ class EGLSyncControlVSyncProvider protected: virtual bool GetSyncValues(int64* system_time, int64* media_stream_counter, - int64* swap_buffer_counter) OVERRIDE { + int64* swap_buffer_counter) override { uint64 u_system_time, u_media_stream_counter, u_swap_buffer_counter; bool result = eglGetSyncValuesCHROMIUM( g_display, surface_, &u_system_time, @@ -92,7 +92,7 @@ class EGLSyncControlVSyncProvider return result; } - virtual bool GetMscRate(int32* numerator, int32* denominator) OVERRIDE { + virtual bool GetMscRate(int32* numerator, int32* denominator) override { return false; } diff --git a/ui/gl/gl_surface_egl.h b/ui/gl/gl_surface_egl.h index e682f4b..b0b3336 100644 --- a/ui/gl/gl_surface_egl.h +++ b/ui/gl/gl_surface_egl.h @@ -29,7 +29,7 @@ class GL_EXPORT GLSurfaceEGL : public GLSurface { GLSurfaceEGL(); // Implement GLSurface. - virtual EGLDisplay GetDisplay() OVERRIDE; + virtual EGLDisplay GetDisplay() override; static bool InitializeOneOff(); static EGLDisplay GetHardwareDisplay(); @@ -60,18 +60,18 @@ class GL_EXPORT NativeViewGLSurfaceEGL : public GLSurfaceEGL { explicit NativeViewGLSurfaceEGL(EGLNativeWindowType window); // Implement GLSurface. - virtual EGLConfig GetConfig() OVERRIDE; - virtual bool Initialize() OVERRIDE; - virtual void Destroy() OVERRIDE; - virtual bool Resize(const gfx::Size& size) OVERRIDE; - virtual bool Recreate() OVERRIDE; - virtual bool IsOffscreen() OVERRIDE; - virtual bool SwapBuffers() OVERRIDE; - virtual gfx::Size GetSize() OVERRIDE; - virtual EGLSurface GetHandle() OVERRIDE; - virtual bool SupportsPostSubBuffer() OVERRIDE; - virtual bool PostSubBuffer(int x, int y, int width, int height) OVERRIDE; - virtual VSyncProvider* GetVSyncProvider() OVERRIDE; + virtual EGLConfig GetConfig() override; + virtual bool Initialize() override; + virtual void Destroy() override; + virtual bool Resize(const gfx::Size& size) override; + virtual bool Recreate() override; + virtual bool IsOffscreen() override; + virtual bool SwapBuffers() override; + virtual gfx::Size GetSize() override; + virtual EGLSurface GetHandle() override; + virtual bool SupportsPostSubBuffer() override; + virtual bool PostSubBuffer(int x, int y, int width, int height) override; + virtual VSyncProvider* GetVSyncProvider() override; // Create a NativeViewGLSurfaceEGL with an externally provided VSyncProvider. // Takes ownership of the VSyncProvider. @@ -99,15 +99,15 @@ class GL_EXPORT PbufferGLSurfaceEGL : public GLSurfaceEGL { explicit PbufferGLSurfaceEGL(const gfx::Size& size); // Implement GLSurface. - virtual EGLConfig GetConfig() OVERRIDE; - virtual bool Initialize() OVERRIDE; - virtual void Destroy() OVERRIDE; - virtual bool IsOffscreen() OVERRIDE; - virtual bool SwapBuffers() OVERRIDE; - virtual gfx::Size GetSize() OVERRIDE; - virtual bool Resize(const gfx::Size& size) OVERRIDE; - virtual EGLSurface GetHandle() OVERRIDE; - virtual void* GetShareHandle() OVERRIDE; + virtual EGLConfig GetConfig() override; + virtual bool Initialize() override; + virtual void Destroy() override; + virtual bool IsOffscreen() override; + virtual bool SwapBuffers() override; + virtual gfx::Size GetSize() override; + virtual bool Resize(const gfx::Size& size) override; + virtual EGLSurface GetHandle() override; + virtual void* GetShareHandle() override; protected: virtual ~PbufferGLSurfaceEGL(); @@ -127,15 +127,15 @@ class GL_EXPORT SurfacelessEGL : public GLSurfaceEGL { explicit SurfacelessEGL(const gfx::Size& size); // Implement GLSurface. - virtual EGLConfig GetConfig() OVERRIDE; - virtual bool Initialize() OVERRIDE; - virtual void Destroy() OVERRIDE; - virtual bool IsOffscreen() OVERRIDE; - virtual bool SwapBuffers() OVERRIDE; - virtual gfx::Size GetSize() OVERRIDE; - virtual bool Resize(const gfx::Size& size) OVERRIDE; - virtual EGLSurface GetHandle() OVERRIDE; - virtual void* GetShareHandle() OVERRIDE; + virtual EGLConfig GetConfig() override; + virtual bool Initialize() override; + virtual void Destroy() override; + virtual bool IsOffscreen() override; + virtual bool SwapBuffers() override; + virtual gfx::Size GetSize() override; + virtual bool Resize(const gfx::Size& size) override; + virtual EGLSurface GetHandle() override; + virtual void* GetShareHandle() override; protected: virtual ~SurfacelessEGL(); diff --git a/ui/gl/gl_surface_glx.cc b/ui/gl/gl_surface_glx.cc index 10f0681..7189c5a 100644 --- a/ui/gl/gl_surface_glx.cc +++ b/ui/gl/gl_surface_glx.cc @@ -82,12 +82,12 @@ class OMLSyncControlVSyncProvider protected: virtual bool GetSyncValues(int64* system_time, int64* media_stream_counter, - int64* swap_buffer_counter) OVERRIDE { + int64* swap_buffer_counter) override { return glXGetSyncValuesOML(g_display, window_, system_time, media_stream_counter, swap_buffer_counter); } - virtual bool GetMscRate(int32* numerator, int32* denominator) OVERRIDE { + virtual bool GetMscRate(int32* numerator, int32* denominator) override { if (!g_glx_get_msc_rate_oml_supported) return false; @@ -269,7 +269,7 @@ class SGIVideoSyncVSyncProvider } virtual void GetVSyncParameters( - const VSyncProvider::UpdateVSyncCallback& callback) OVERRIDE { + const VSyncProvider::UpdateVSyncCallback& callback) override { if (kGetVSyncParametersMinPeriod > base::TimeDelta()) { base::TimeTicks now = base::TimeTicks::Now(); base::TimeDelta delta = now - last_get_vsync_parameters_time_; diff --git a/ui/gl/gl_surface_glx.h b/ui/gl/gl_surface_glx.h index 37c835c..0627023 100644 --- a/ui/gl/gl_surface_glx.h +++ b/ui/gl/gl_surface_glx.h @@ -35,7 +35,7 @@ class GL_EXPORT GLSurfaceGLX : public GLSurface { static bool IsTextureFromPixmapSupported(); static bool IsOMLSyncControlSupported(); - virtual void* GetDisplay() OVERRIDE; + virtual void* GetDisplay() override; // Get the FB config that the surface was created with or NULL if it is not // a GLX drawable. @@ -55,17 +55,17 @@ class GL_EXPORT NativeViewGLSurfaceGLX : public GLSurfaceGLX, explicit NativeViewGLSurfaceGLX(gfx::AcceleratedWidget window); // Implement GLSurfaceGLX. - virtual bool Initialize() OVERRIDE; - virtual void Destroy() OVERRIDE; - virtual bool Resize(const gfx::Size& size) OVERRIDE; - virtual bool IsOffscreen() OVERRIDE; - virtual bool SwapBuffers() OVERRIDE; - virtual gfx::Size GetSize() OVERRIDE; - virtual void* GetHandle() OVERRIDE; - virtual bool SupportsPostSubBuffer() OVERRIDE; - virtual void* GetConfig() OVERRIDE; - virtual bool PostSubBuffer(int x, int y, int width, int height) OVERRIDE; - virtual VSyncProvider* GetVSyncProvider() OVERRIDE; + virtual bool Initialize() override; + virtual void Destroy() override; + virtual bool Resize(const gfx::Size& size) override; + virtual bool IsOffscreen() override; + virtual bool SwapBuffers() override; + virtual gfx::Size GetSize() override; + virtual void* GetHandle() override; + virtual bool SupportsPostSubBuffer() override; + virtual void* GetConfig() override; + virtual bool PostSubBuffer(int x, int y, int width, int height) override; + virtual VSyncProvider* GetVSyncProvider() override; protected: virtual ~NativeViewGLSurfaceGLX(); @@ -75,8 +75,8 @@ class GL_EXPORT NativeViewGLSurfaceGLX : public GLSurfaceGLX, gfx::AcceleratedWidget GetDrawableHandle() const; // PlatformEventDispatcher implementation - virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE; - virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) OVERRIDE; + virtual bool CanDispatchEvent(const ui::PlatformEvent& event) override; + virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) override; // Window passed in at creation. Always valid. gfx::AcceleratedWidget parent_window_; @@ -98,13 +98,13 @@ class GL_EXPORT PbufferGLSurfaceGLX : public GLSurfaceGLX { explicit PbufferGLSurfaceGLX(const gfx::Size& size); // Implement GLSurfaceGLX. - virtual bool Initialize() OVERRIDE; - virtual void Destroy() OVERRIDE; - virtual bool IsOffscreen() OVERRIDE; - virtual bool SwapBuffers() OVERRIDE; - virtual gfx::Size GetSize() OVERRIDE; - virtual void* GetHandle() OVERRIDE; - virtual void* GetConfig() OVERRIDE; + virtual bool Initialize() override; + virtual void Destroy() override; + virtual bool IsOffscreen() override; + virtual bool SwapBuffers() override; + virtual gfx::Size GetSize() override; + virtual void* GetHandle() override; + virtual void* GetConfig() override; protected: virtual ~PbufferGLSurfaceGLX(); diff --git a/ui/gl/gl_surface_mac.cc b/ui/gl/gl_surface_mac.cc index 41f6798..dec5a9a 100644 --- a/ui/gl/gl_surface_mac.cc +++ b/ui/gl/gl_surface_mac.cc @@ -30,16 +30,16 @@ class GL_EXPORT NoOpGLSurface : public GLSurface { explicit NoOpGLSurface(const gfx::Size& size) : size_(size) {} // Implement GLSurface. - virtual bool Initialize() OVERRIDE { return true; } - virtual void Destroy() OVERRIDE {} - virtual bool IsOffscreen() OVERRIDE { return true; } - virtual bool SwapBuffers() OVERRIDE { + virtual bool Initialize() override { return true; } + virtual void Destroy() override {} + virtual bool IsOffscreen() override { return true; } + virtual bool SwapBuffers() override { NOTREACHED() << "Cannot call SwapBuffers on a NoOpGLSurface."; return false; } - virtual gfx::Size GetSize() OVERRIDE { return size_; } - virtual void* GetHandle() OVERRIDE { return NULL; } - virtual void* GetDisplay() OVERRIDE { return NULL; } + virtual gfx::Size GetSize() override { return size_; } + virtual void* GetHandle() override { return NULL; } + virtual void* GetDisplay() override { return NULL; } protected: virtual ~NoOpGLSurface() {} diff --git a/ui/gl/gl_surface_osmesa.h b/ui/gl/gl_surface_osmesa.h index 472d7b1..20fb17f 100644 --- a/ui/gl/gl_surface_osmesa.h +++ b/ui/gl/gl_surface_osmesa.h @@ -21,14 +21,14 @@ class GL_EXPORT GLSurfaceOSMesa : public GLSurface { GLSurfaceOSMesa(OSMesaSurfaceFormat format, const gfx::Size& size); // Implement GLSurface. - virtual bool Initialize() OVERRIDE; - virtual void Destroy() OVERRIDE; - virtual bool Resize(const gfx::Size& new_size) OVERRIDE; - virtual bool IsOffscreen() OVERRIDE; - virtual bool SwapBuffers() OVERRIDE; - virtual gfx::Size GetSize() OVERRIDE; - virtual void* GetHandle() OVERRIDE; - virtual unsigned GetFormat() OVERRIDE; + virtual bool Initialize() override; + virtual void Destroy() override; + virtual bool Resize(const gfx::Size& new_size) override; + virtual bool IsOffscreen() override; + virtual bool SwapBuffers() override; + virtual gfx::Size GetSize() override; + virtual void* GetHandle() override; + virtual unsigned GetFormat() override; protected: virtual ~GLSurfaceOSMesa(); @@ -48,8 +48,8 @@ class GLSurfaceOSMesaHeadless : public GLSurfaceOSMesa { public: explicit GLSurfaceOSMesaHeadless(); - virtual bool IsOffscreen() OVERRIDE; - virtual bool SwapBuffers() OVERRIDE; + virtual bool IsOffscreen() override; + virtual bool SwapBuffers() override; protected: virtual ~GLSurfaceOSMesaHeadless(); diff --git a/ui/gl/gl_surface_ozone.cc b/ui/gl/gl_surface_ozone.cc index a47a759..4576195 100644 --- a/ui/gl/gl_surface_ozone.cc +++ b/ui/gl/gl_surface_ozone.cc @@ -30,10 +30,10 @@ class GL_EXPORT GLSurfaceOzoneEGL : public NativeViewGLSurfaceEGL { ozone_surface_(ozone_surface.Pass()), widget_(widget) {} - virtual bool Initialize() OVERRIDE { + virtual bool Initialize() override { return Initialize(ozone_surface_->CreateVSyncProvider()); } - virtual bool Resize(const gfx::Size& size) OVERRIDE { + virtual bool Resize(const gfx::Size& size) override { if (!ozone_surface_->ResizeNativeWindow(size)) { if (!ReinitializeNativeSurface() || !ozone_surface_->ResizeNativeWindow(size)) @@ -42,7 +42,7 @@ class GL_EXPORT GLSurfaceOzoneEGL : public NativeViewGLSurfaceEGL { return NativeViewGLSurfaceEGL::Resize(size); } - virtual bool SwapBuffers() OVERRIDE { + virtual bool SwapBuffers() override { if (!NativeViewGLSurfaceEGL::SwapBuffers()) return false; @@ -52,7 +52,7 @@ class GL_EXPORT GLSurfaceOzoneEGL : public NativeViewGLSurfaceEGL { OverlayTransform transform, GLImage* image, const Rect& bounds_rect, - const RectF& crop_rect) OVERRIDE { + const RectF& crop_rect) override { return image->ScheduleOverlayPlane( widget_, z_order, transform, bounds_rect, crop_rect); } @@ -107,7 +107,7 @@ class GL_EXPORT GLSurfaceOzoneSurfaceless : public SurfacelessEGL { ozone_surface_(ozone_surface.Pass()), widget_(widget) {} - virtual bool Initialize() OVERRIDE { + virtual bool Initialize() override { if (!SurfacelessEGL::Initialize()) return false; vsync_provider_ = ozone_surface_->CreateVSyncProvider(); @@ -115,13 +115,13 @@ class GL_EXPORT GLSurfaceOzoneSurfaceless : public SurfacelessEGL { return false; return true; } - virtual bool Resize(const gfx::Size& size) OVERRIDE { + virtual bool Resize(const gfx::Size& size) override { if (!ozone_surface_->ResizeNativeWindow(size)) return false; return SurfacelessEGL::Resize(size); } - virtual bool SwapBuffers() OVERRIDE { + virtual bool SwapBuffers() override { // TODO: this should be replaced by a fence when supported by the driver. glFinish(); return ozone_surface_->OnSwapBuffers(); @@ -130,21 +130,21 @@ class GL_EXPORT GLSurfaceOzoneSurfaceless : public SurfacelessEGL { OverlayTransform transform, GLImage* image, const Rect& bounds_rect, - const RectF& crop_rect) OVERRIDE { + const RectF& crop_rect) override { return image->ScheduleOverlayPlane( widget_, z_order, transform, bounds_rect, crop_rect); } - virtual bool IsOffscreen() OVERRIDE { return false; } - virtual VSyncProvider* GetVSyncProvider() OVERRIDE { + virtual bool IsOffscreen() override { return false; } + virtual VSyncProvider* GetVSyncProvider() override { return vsync_provider_.get(); } - virtual bool SupportsPostSubBuffer() OVERRIDE { return true; } - virtual bool PostSubBuffer(int x, int y, int width, int height) OVERRIDE { + virtual bool SupportsPostSubBuffer() override { return true; } + virtual bool PostSubBuffer(int x, int y, int width, int height) override { // The actual sub buffer handling is handled at higher layers. SwapBuffers(); return true; } - virtual bool IsSurfaceless() const OVERRIDE { return true; } + virtual bool IsSurfaceless() const override { return true; } private: virtual ~GLSurfaceOzoneSurfaceless() { diff --git a/ui/gl/gl_surface_stub.h b/ui/gl/gl_surface_stub.h index 14e24b0..8a80dfe 100644 --- a/ui/gl/gl_surface_stub.h +++ b/ui/gl/gl_surface_stub.h @@ -15,11 +15,11 @@ class GL_EXPORT GLSurfaceStub : public GLSurface { void SetSize(const gfx::Size& size) { size_ = size; } // Implement GLSurface. - virtual void Destroy() OVERRIDE; - virtual bool IsOffscreen() OVERRIDE; - virtual bool SwapBuffers() OVERRIDE; - virtual gfx::Size GetSize() OVERRIDE; - virtual void* GetHandle() OVERRIDE; + virtual void Destroy() override; + virtual bool IsOffscreen() override; + virtual bool SwapBuffers() override; + virtual gfx::Size GetSize() override; + virtual void* GetHandle() override; protected: virtual ~GLSurfaceStub(); diff --git a/ui/gl/gl_surface_win.cc b/ui/gl/gl_surface_win.cc index df7613e..2219f32 100644 --- a/ui/gl/gl_surface_win.cc +++ b/ui/gl/gl_surface_win.cc @@ -45,12 +45,12 @@ class NativeViewGLSurfaceOSMesa : public GLSurfaceOSMesa { virtual ~NativeViewGLSurfaceOSMesa(); // Implement subset of GLSurface. - virtual bool Initialize() OVERRIDE; - virtual void Destroy() OVERRIDE; - virtual bool IsOffscreen() OVERRIDE; - virtual bool SwapBuffers() OVERRIDE; - virtual bool SupportsPostSubBuffer() OVERRIDE; - virtual bool PostSubBuffer(int x, int y, int width, int height) OVERRIDE; + virtual bool Initialize() override; + virtual void Destroy() override; + virtual bool IsOffscreen() override; + virtual bool SwapBuffers() override; + virtual bool SupportsPostSubBuffer() override; + virtual bool PostSubBuffer(int x, int y, int width, int height) override; private: gfx::AcceleratedWidget window_; diff --git a/ui/gl/gl_surface_x11.cc b/ui/gl/gl_surface_x11.cc index bc9f1e6..55a0f38 100644 --- a/ui/gl/gl_surface_x11.cc +++ b/ui/gl/gl_surface_x11.cc @@ -28,13 +28,13 @@ class NativeViewGLSurfaceOSMesa : public GLSurfaceOSMesa { static bool InitializeOneOff(); // Implement a subset of GLSurface. - virtual bool Initialize() OVERRIDE; - virtual void Destroy() OVERRIDE; - virtual bool Resize(const gfx::Size& new_size) OVERRIDE; - virtual bool IsOffscreen() OVERRIDE; - virtual bool SwapBuffers() OVERRIDE; - virtual bool SupportsPostSubBuffer() OVERRIDE; - virtual bool PostSubBuffer(int x, int y, int width, int height) OVERRIDE; + virtual bool Initialize() override; + virtual void Destroy() override; + virtual bool Resize(const gfx::Size& new_size) override; + virtual bool IsOffscreen() override; + virtual bool SwapBuffers() override; + virtual bool SupportsPostSubBuffer() override; + virtual bool PostSubBuffer(int x, int y, int width, int height) override; protected: virtual ~NativeViewGLSurfaceOSMesa(); diff --git a/ui/gl/sync_control_vsync_provider.h b/ui/gl/sync_control_vsync_provider.h index edee2b0..3360354 100644 --- a/ui/gl/sync_control_vsync_provider.h +++ b/ui/gl/sync_control_vsync_provider.h @@ -18,7 +18,7 @@ class SyncControlVSyncProvider : public VSyncProvider { SyncControlVSyncProvider(); virtual ~SyncControlVSyncProvider(); - virtual void GetVSyncParameters(const UpdateVSyncCallback& callback) OVERRIDE; + virtual void GetVSyncParameters(const UpdateVSyncCallback& callback) override; protected: virtual bool GetSyncValues(int64* system_time, diff --git a/ui/keyboard/keyboard_controller.cc b/ui/keyboard/keyboard_controller.cc index 8e9fd20..396ac49 100644 --- a/ui/keyboard/keyboard_controller.cc +++ b/ui/keyboard/keyboard_controller.cc @@ -62,7 +62,7 @@ class KeyboardContainerTargeter : public wm::MaskedWindowTargeter { private: // wm::MaskedWindowTargeter: virtual bool GetHitTestMask(aura::Window* window, - gfx::Path* mask) const OVERRIDE { + gfx::Path* mask) const override { if (proxy_ && !proxy_->HasKeyboardWindow()) return true; gfx::Rect keyboard_bounds = proxy_ ? proxy_->GetKeyboardWindow()->bounds() : @@ -88,34 +88,34 @@ class KeyboardWindowDelegate : public aura::WindowDelegate { private: // Overridden from aura::WindowDelegate: - virtual gfx::Size GetMinimumSize() const OVERRIDE { return gfx::Size(); } - virtual gfx::Size GetMaximumSize() const OVERRIDE { return gfx::Size(); } + virtual gfx::Size GetMinimumSize() const override { return gfx::Size(); } + virtual gfx::Size GetMaximumSize() const override { return gfx::Size(); } virtual void OnBoundsChanged(const gfx::Rect& old_bounds, - const gfx::Rect& new_bounds) OVERRIDE { + const gfx::Rect& new_bounds) override { bounds_ = new_bounds; } - virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE { + virtual gfx::NativeCursor GetCursor(const gfx::Point& point) override { return gfx::kNullCursor; } - virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE { + virtual int GetNonClientComponent(const gfx::Point& point) const override { return HTNOWHERE; } virtual bool ShouldDescendIntoChildForEventHandling( aura::Window* child, - const gfx::Point& location) OVERRIDE { + const gfx::Point& location) override { return true; } - virtual bool CanFocus() OVERRIDE { return false; } - virtual void OnCaptureLost() OVERRIDE {} - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {} - virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE {} - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE {} - virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE { delete this; } - virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE {} - virtual bool HasHitTestMask() const OVERRIDE { + virtual bool CanFocus() override { return false; } + virtual void OnCaptureLost() override {} + virtual void OnPaint(gfx::Canvas* canvas) override {} + virtual void OnDeviceScaleFactorChanged(float device_scale_factor) override {} + virtual void OnWindowDestroying(aura::Window* window) override {} + virtual void OnWindowDestroyed(aura::Window* window) override { delete this; } + virtual void OnWindowTargetVisibilityChanged(bool visible) override {} + virtual bool HasHitTestMask() const override { return !proxy_ || proxy_->HasKeyboardWindow(); } - virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE { + virtual void GetHitTestMask(gfx::Path* mask) const override { if (proxy_ && !proxy_->HasKeyboardWindow()) return; gfx::Rect keyboard_bounds = proxy_ ? proxy_->GetKeyboardWindow()->bounds() : @@ -171,11 +171,11 @@ class CallbackAnimationObserver : public ui::LayerAnimationObserver { private: // Overridden from ui::LayerAnimationObserver: - virtual void OnLayerAnimationEnded(ui::LayerAnimationSequence* seq) OVERRIDE; + virtual void OnLayerAnimationEnded(ui::LayerAnimationSequence* seq) override; virtual void OnLayerAnimationAborted( - ui::LayerAnimationSequence* seq) OVERRIDE; + ui::LayerAnimationSequence* seq) override; virtual void OnLayerAnimationScheduled( - ui::LayerAnimationSequence* seq) OVERRIDE {} + ui::LayerAnimationSequence* seq) override {} ui::LayerAnimator* animator_; base::Callback<void(void)> callback_; @@ -209,8 +209,8 @@ class WindowBoundsChangeObserver : public aura::WindowObserver { public: virtual void OnWindowBoundsChanged(aura::Window* window, const gfx::Rect& old_bounds, - const gfx::Rect& new_bounds) OVERRIDE; - virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; + const gfx::Rect& new_bounds) override; + virtual void OnWindowDestroyed(aura::Window* window) override; void AddObservedWindow(aura::Window* window); void RemoveAllObservedWindows(); diff --git a/ui/keyboard/keyboard_controller.h b/ui/keyboard/keyboard_controller.h index fbb1bdcf..dc44cd6 100644 --- a/ui/keyboard/keyboard_controller.h +++ b/ui/keyboard/keyboard_controller.h @@ -116,20 +116,20 @@ class KEYBOARD_EXPORT KeyboardController : public ui::InputMethodObserver, // aura::WindowObserver overrides virtual void OnWindowHierarchyChanged( - const HierarchyChangeParams& params) OVERRIDE; + const HierarchyChangeParams& params) override; // InputMethodObserver overrides virtual void OnTextInputTypeChanged( - const ui::TextInputClient* client) OVERRIDE {} - virtual void OnFocus() OVERRIDE {} - virtual void OnBlur() OVERRIDE {} + const ui::TextInputClient* client) override {} + virtual void OnFocus() override {} + virtual void OnBlur() override {} virtual void OnCaretBoundsChanged( - const ui::TextInputClient* client) OVERRIDE {} + const ui::TextInputClient* client) override {} virtual void OnTextInputStateChanged( - const ui::TextInputClient* client) OVERRIDE; + const ui::TextInputClient* client) override; virtual void OnInputMethodDestroyed( - const ui::InputMethod* input_method) OVERRIDE; - virtual void OnShowImeIfNeeded() OVERRIDE; + const ui::InputMethod* input_method) override; + virtual void OnShowImeIfNeeded() override; // Show virtual keyboard immediately with animation. void ShowKeyboardInternal(); diff --git a/ui/keyboard/keyboard_controller_proxy.cc b/ui/keyboard/keyboard_controller_proxy.cc index cd98f9a..37f655d 100644 --- a/ui/keyboard/keyboard_controller_proxy.cc +++ b/ui/keyboard/keyboard_controller_proxy.cc @@ -37,7 +37,7 @@ class KeyboardContentsDelegate : public content::WebContentsDelegate, // Overridden from content::WebContentsDelegate: virtual content::WebContents* OpenURLFromTab( content::WebContents* source, - const content::OpenURLParams& params) OVERRIDE { + const content::OpenURLParams& params) override { source->GetController().LoadURL( params.url, params.referrer, params.transition, params.extra_headers); Observe(source); @@ -45,12 +45,12 @@ class KeyboardContentsDelegate : public content::WebContentsDelegate, } virtual bool IsPopupOrPanel( - const content::WebContents* source) const OVERRIDE { + const content::WebContents* source) const override { return true; } virtual void MoveContents(content::WebContents* source, - const gfx::Rect& pos) OVERRIDE { + const gfx::Rect& pos) override { aura::Window* keyboard = proxy_->GetKeyboardWindow(); // keyboard window must have been added to keyboard container window at this // point. Otherwise, wrong keyboard bounds is used and may cause problem as @@ -70,12 +70,12 @@ class KeyboardContentsDelegate : public content::WebContentsDelegate, // Overridden from content::WebContentsDelegate: virtual void RequestMediaAccessPermission(content::WebContents* web_contents, const content::MediaStreamRequest& request, - const content::MediaResponseCallback& callback) OVERRIDE { + const content::MediaResponseCallback& callback) override { proxy_->RequestAudioInput(web_contents, request, callback); } // Overridden from content::WebContentsObserver: - virtual void WebContentsDestroyed() OVERRIDE { + virtual void WebContentsDestroyed() override { delete this; } diff --git a/ui/keyboard/keyboard_controller_proxy.h b/ui/keyboard/keyboard_controller_proxy.h index d7886e2..f893eea 100644 --- a/ui/keyboard/keyboard_controller_proxy.h +++ b/ui/keyboard/keyboard_controller_proxy.h @@ -115,8 +115,8 @@ class KEYBOARD_EXPORT KeyboardControllerProxy : public aura::WindowObserver { // aura::WindowObserver overrides: virtual void OnWindowBoundsChanged(aura::Window* window, const gfx::Rect& old_bounds, - const gfx::Rect& new_bounds) OVERRIDE; - virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; + const gfx::Rect& new_bounds) override; + virtual void OnWindowDestroyed(aura::Window* window) override; private: friend class TestApi; diff --git a/ui/keyboard/keyboard_controller_unittest.cc b/ui/keyboard/keyboard_controller_unittest.cc index 51c4e0f..9c3ccb6 100644 --- a/ui/keyboard/keyboard_controller_unittest.cc +++ b/ui/keyboard/keyboard_controller_unittest.cc @@ -68,7 +68,7 @@ class TestFocusController : public ui::EventHandler { private: // Overridden from ui::EventHandler: - virtual void OnEvent(ui::Event* event) OVERRIDE { + virtual void OnEvent(ui::Event* event) override { aura::Window* target = static_cast<aura::Window*>(event->target()); if (event->type() == ui::ET_MOUSE_PRESSED || event->type() == ui::ET_TOUCH_PRESSED) { @@ -92,8 +92,8 @@ class TestKeyboardControllerProxy : public KeyboardControllerProxy { } // Overridden from KeyboardControllerProxy: - virtual bool HasKeyboardWindow() const OVERRIDE { return window_; } - virtual aura::Window* GetKeyboardWindow() OVERRIDE { + virtual bool HasKeyboardWindow() const override { return window_; } + virtual aura::Window* GetKeyboardWindow() override { if (!window_) { window_.reset(new aura::Window(&delegate_)); window_->Init(aura::WINDOW_LAYER_NOT_DRAWN); @@ -101,15 +101,15 @@ class TestKeyboardControllerProxy : public KeyboardControllerProxy { } return window_.get(); } - virtual content::BrowserContext* GetBrowserContext() OVERRIDE { return NULL; } - virtual ui::InputMethod* GetInputMethod() OVERRIDE { + virtual content::BrowserContext* GetBrowserContext() override { return NULL; } + virtual ui::InputMethod* GetInputMethod() override { return input_method_.get(); } virtual void RequestAudioInput(content::WebContents* web_contents, const content::MediaStreamRequest& request, - const content::MediaResponseCallback& callback) OVERRIDE { return; } - virtual void LoadSystemKeyboard() OVERRIDE {}; - virtual void ReloadKeyboardIfNeeded() OVERRIDE {}; + const content::MediaResponseCallback& callback) override { return; } + virtual void LoadSystemKeyboard() override {}; + virtual void ReloadKeyboardIfNeeded() override {}; private: scoped_ptr<aura::Window> window_; @@ -131,7 +131,7 @@ class EventObserver : public ui::EventHandler { private: // Overridden from ui::EventHandler: - virtual void OnEvent(ui::Event* event) OVERRIDE { + virtual void OnEvent(ui::Event* event) override { ui::EventHandler::OnEvent(event); event_counts_[event->type()]++; } @@ -151,7 +151,7 @@ class KeyboardContainerObserver : public aura::WindowObserver { private: virtual void OnWindowVisibilityChanged(aura::Window* window, - bool visible) OVERRIDE { + bool visible) override { if (!visible) base::MessageLoop::current()->Quit(); } @@ -168,7 +168,7 @@ class KeyboardControllerTest : public testing::Test { KeyboardControllerTest() {} virtual ~KeyboardControllerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { // The ContextFactory must exist before any Compositors are created. bool enable_pixel_output = false; ui::ContextFactory* context_factory = @@ -185,7 +185,7 @@ class KeyboardControllerTest : public testing::Test { controller_.reset(new KeyboardController(proxy_)); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { controller_.reset(); focus_controller_.reset(); if (::switches::IsTextInputFocusManagerEnabled()) @@ -499,7 +499,7 @@ class KeyboardControllerAnimationTest : public KeyboardControllerTest, KeyboardControllerAnimationTest() {} virtual ~KeyboardControllerAnimationTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { // We cannot short-circuit animations for this test. ui::ScopedAnimationDurationScaleMode test_duration_mode( ui::ScopedAnimationDurationScaleMode::NON_ZERO_DURATION); @@ -512,14 +512,14 @@ class KeyboardControllerAnimationTest : public KeyboardControllerTest, controller()->AddObserver(this); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { controller()->RemoveObserver(this); KeyboardControllerTest::TearDown(); } protected: // KeyboardControllerObserver overrides - virtual void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) OVERRIDE { + virtual void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override { notified_bounds_ = new_bounds; } diff --git a/ui/keyboard/keyboard_layout_manager.h b/ui/keyboard/keyboard_layout_manager.h index bc13f16..b93665f 100644 --- a/ui/keyboard/keyboard_layout_manager.h +++ b/ui/keyboard/keyboard_layout_manager.h @@ -22,14 +22,14 @@ class KeyboardLayoutManager : public aura::LayoutManager { } // Overridden from aura::LayoutManager - virtual void OnWindowResized() OVERRIDE; - virtual void OnWindowAddedToLayout(aura::Window* child) OVERRIDE; - virtual void OnWillRemoveWindowFromLayout(aura::Window* child) OVERRIDE {} - virtual void OnWindowRemovedFromLayout(aura::Window* child) OVERRIDE {} + virtual void OnWindowResized() override; + virtual void OnWindowAddedToLayout(aura::Window* child) override; + virtual void OnWillRemoveWindowFromLayout(aura::Window* child) override {} + virtual void OnWindowRemovedFromLayout(aura::Window* child) override {} virtual void OnChildWindowVisibilityChanged(aura::Window* child, - bool visible) OVERRIDE {} + bool visible) override {} virtual void SetChildBounds(aura::Window* child, - const gfx::Rect& requested_bounds) OVERRIDE; + const gfx::Rect& requested_bounds) override; private: KeyboardController* controller_; diff --git a/ui/keyboard/test/run_all_unittests.cc b/ui/keyboard/test/run_all_unittests.cc index 9ecd0c6..519f69f 100644 --- a/ui/keyboard/test/run_all_unittests.cc +++ b/ui/keyboard/test/run_all_unittests.cc @@ -20,7 +20,7 @@ class KeyboardTestSuite : public base::TestSuite { KeyboardTestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {} protected: - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { base::TestSuite::Initialize(); gfx::GLSurface::InitializeOneOffForTests(); ui::RegisterPathProvider(); @@ -30,7 +30,7 @@ class KeyboardTestSuite : public base::TestSuite { ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path); } - virtual void Shutdown() OVERRIDE { + virtual void Shutdown() override { ui::ResourceBundle::CleanupSharedInstance(); base::TestSuite::Shutdown(); } diff --git a/ui/keyboard/webui/vk_mojo_handler.h b/ui/keyboard/webui/vk_mojo_handler.h index 7ee3c9d..a7985db 100644 --- a/ui/keyboard/webui/vk_mojo_handler.h +++ b/ui/keyboard/webui/vk_mojo_handler.h @@ -21,27 +21,27 @@ class VKMojoHandler : public mojo::InterfaceImpl<KeyboardUIHandlerMojo>, ui::InputMethod* GetInputMethod(); // mojo::InterfaceImpl<>: - virtual void OnConnectionEstablished() OVERRIDE; + virtual void OnConnectionEstablished() override; // KeyboardUIHandlerMojo: virtual void SendKeyEvent(const mojo::String& event_type, int32_t char_value, int32_t key_code, const mojo::String& key_name, - int32_t modifiers) OVERRIDE; - virtual void HideKeyboard() OVERRIDE; + int32_t modifiers) override; + virtual void HideKeyboard() override; // ui::InputMethodObserver: virtual void OnTextInputTypeChanged( - const ui::TextInputClient* client) OVERRIDE; - virtual void OnFocus() OVERRIDE; - virtual void OnBlur() OVERRIDE; - virtual void OnCaretBoundsChanged(const ui::TextInputClient* client) OVERRIDE; + 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* text_client) OVERRIDE; + const ui::TextInputClient* text_client) override; virtual void OnInputMethodDestroyed( - const ui::InputMethod* input_method) OVERRIDE; - virtual void OnShowImeIfNeeded() OVERRIDE; + const ui::InputMethod* input_method) override; + virtual void OnShowImeIfNeeded() override; DISALLOW_COPY_AND_ASSIGN(VKMojoHandler); }; diff --git a/ui/keyboard/webui/vk_webui_controller.h b/ui/keyboard/webui/vk_webui_controller.h index d701c63..97ee5a56 100644 --- a/ui/keyboard/webui/vk_webui_controller.h +++ b/ui/keyboard/webui/vk_webui_controller.h @@ -33,7 +33,7 @@ class VKWebUIController : public content::WebUIController { mojo::InterfaceRequest<KeyboardUIHandlerMojo> request); // content::WebUIController: - virtual void RenderViewCreated(content::RenderViewHost* host) OVERRIDE; + virtual void RenderViewCreated(content::RenderViewHost* host) override; scoped_ptr<VKMojoHandler> ui_handler_; base::WeakPtrFactory<VKWebUIController> weak_factory_; @@ -47,14 +47,14 @@ class KEYBOARD_EXPORT VKWebUIControllerFactory // WebUIControllerFactory: virtual content::WebUI::TypeID GetWebUIType( content::BrowserContext* browser_context, - const GURL& url) const OVERRIDE; + const GURL& url) const override; virtual bool UseWebUIForURL(content::BrowserContext* browser_context, - const GURL& url) const OVERRIDE; + const GURL& url) const override; virtual bool UseWebUIBindingsForURL(content::BrowserContext* browser_context, - const GURL& url) const OVERRIDE; + const GURL& url) const override; virtual content::WebUIController* CreateWebUIControllerForURL( content::WebUI* web_ui, - const GURL& url) const OVERRIDE; + const GURL& url) const override; static VKWebUIControllerFactory* GetInstance(); diff --git a/ui/message_center/cocoa/notification_controller_unittest.mm b/ui/message_center/cocoa/notification_controller_unittest.mm index 4a77441..6ff7091 100644 --- a/ui/message_center/cocoa/notification_controller_unittest.mm +++ b/ui/message_center/cocoa/notification_controller_unittest.mm @@ -30,14 +30,14 @@ class MockMessageCenter : public message_center::FakeMessageCenter { last_clicked_index_(-1) {} virtual void RemoveNotification(const std::string& id, - bool by_user) OVERRIDE { + bool by_user) override { last_removed_id_ = id; last_removed_by_user_ = by_user; ++remove_count_; } virtual void ClickOnNotificationButton(const std::string& id, - int button_index) OVERRIDE { + int button_index) override { last_clicked_id_ = id; last_clicked_index_ = button_index; } diff --git a/ui/message_center/cocoa/popup_collection.mm b/ui/message_center/cocoa/popup_collection.mm index adc4f62..7320dcb 100644 --- a/ui/message_center/cocoa/popup_collection.mm +++ b/ui/message_center/cocoa/popup_collection.mm @@ -62,17 +62,17 @@ class PopupCollectionObserver : public message_center::MessageCenterObserver { } virtual void OnNotificationAdded( - const std::string& notification_id) OVERRIDE { + const std::string& notification_id) override { [popup_collection_ layoutNewNotifications]; } virtual void OnNotificationRemoved(const std::string& notification_id, - bool user_id) OVERRIDE { + bool user_id) override { [popup_collection_ removeNotification:notification_id]; } virtual void OnNotificationUpdated( - const std::string& notification_id) OVERRIDE { + const std::string& notification_id) override { [popup_collection_ updateNotification:notification_id]; } diff --git a/ui/message_center/cocoa/popup_collection_unittest.mm b/ui/message_center/cocoa/popup_collection_unittest.mm index 12029ab..d2990bc 100644 --- a/ui/message_center/cocoa/popup_collection_unittest.mm +++ b/ui/message_center/cocoa/popup_collection_unittest.mm @@ -35,7 +35,7 @@ class PopupCollectionTest : public ui::CocoaTest { }]; } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { collection_.reset(); // Close all popups. ui::CocoaTest::TearDown(); } diff --git a/ui/message_center/cocoa/settings_controller.h b/ui/message_center/cocoa/settings_controller.h index 2efa944..83433b4 100644 --- a/ui/message_center/cocoa/settings_controller.h +++ b/ui/message_center/cocoa/settings_controller.h @@ -28,10 +28,10 @@ class NotifierSettingsObserverMac : public NotifierSettingsObserver { // Overridden from NotifierSettingsObserver: virtual void UpdateIconImage(const NotifierId& notifier_id, - const gfx::Image& icon) OVERRIDE; - virtual void NotifierGroupChanged() OVERRIDE; + const gfx::Image& icon) override; + virtual void NotifierGroupChanged() override; virtual void NotifierEnabledChanged(const NotifierId& notifier_id, - bool enabled) OVERRIDE; + bool enabled) override; private: MCSettingsController* settings_controller_; // weak, owns this diff --git a/ui/message_center/cocoa/status_item_view_unittest.mm b/ui/message_center/cocoa/status_item_view_unittest.mm index f673a11..fb98a07 100644 --- a/ui/message_center/cocoa/status_item_view_unittest.mm +++ b/ui/message_center/cocoa/status_item_view_unittest.mm @@ -13,12 +13,12 @@ class StatusItemViewTest : public ui::CocoaTest { : view_([[MCStatusItemView alloc] init]) { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ui::CocoaTest::SetUp(); [[test_window() contentView] addSubview:view_]; } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { [view_ removeItem]; ui::CocoaTest::TearDown(); } diff --git a/ui/message_center/cocoa/tray_controller_unittest.mm b/ui/message_center/cocoa/tray_controller_unittest.mm index 285e8b6..8a4c6f7 100644 --- a/ui/message_center/cocoa/tray_controller_unittest.mm +++ b/ui/message_center/cocoa/tray_controller_unittest.mm @@ -14,7 +14,7 @@ namespace message_center { class TrayControllerTest : public ui::CocoaTest { public: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ui::CocoaTest::SetUp(); message_center::MessageCenter::Initialize(); tray_.reset(new message_center::MessageCenterTray( @@ -23,7 +23,7 @@ class TrayControllerTest : public ui::CocoaTest { [[MCTrayController alloc] initWithMessageCenterTray:tray_.get()]); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { controller_.reset(); tray_.reset(); message_center::MessageCenter::Shutdown(); diff --git a/ui/message_center/cocoa/tray_view_controller_unittest.mm b/ui/message_center/cocoa/tray_view_controller_unittest.mm index 9496177..801f3f6 100644 --- a/ui/message_center/cocoa/tray_view_controller_unittest.mm +++ b/ui/message_center/cocoa/tray_view_controller_unittest.mm @@ -26,7 +26,7 @@ class TrayViewControllerTest : public ui::CocoaTest { : center_(NULL) { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ui::CocoaTest::SetUp(); message_center::MessageCenter::Initialize(); center_ = message_center::MessageCenter::Get(); @@ -41,7 +41,7 @@ class TrayViewControllerTest : public ui::CocoaTest { [tray_ view]; // Create the view. } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { tray_.reset(); message_center::MessageCenter::Shutdown(); ui::CocoaTest::TearDown(); diff --git a/ui/message_center/fake_message_center.h b/ui/message_center/fake_message_center.h index 22273b8..073cff9 100644 --- a/ui/message_center/fake_message_center.h +++ b/ui/message_center/fake_message_center.h @@ -19,60 +19,60 @@ class FakeMessageCenter : public MessageCenter { virtual ~FakeMessageCenter(); // Overridden from FakeMessageCenter. - virtual void AddObserver(MessageCenterObserver* observer) OVERRIDE; - virtual void RemoveObserver(MessageCenterObserver* observer) OVERRIDE; - virtual void AddNotificationBlocker(NotificationBlocker* blocker) OVERRIDE; - virtual void RemoveNotificationBlocker(NotificationBlocker* blocker) OVERRIDE; - virtual size_t NotificationCount() const OVERRIDE; - virtual size_t UnreadNotificationCount() const OVERRIDE; - virtual bool HasPopupNotifications() const OVERRIDE; - virtual bool IsQuietMode() const OVERRIDE; - virtual bool HasClickedListener(const std::string& id) OVERRIDE; + virtual void AddObserver(MessageCenterObserver* observer) override; + virtual void RemoveObserver(MessageCenterObserver* observer) override; + virtual void AddNotificationBlocker(NotificationBlocker* blocker) override; + virtual void RemoveNotificationBlocker(NotificationBlocker* blocker) override; + virtual size_t NotificationCount() const override; + virtual size_t UnreadNotificationCount() const override; + virtual bool HasPopupNotifications() const override; + virtual bool IsQuietMode() const override; + virtual bool HasClickedListener(const std::string& id) override; virtual message_center::Notification* FindVisibleNotificationById( - const std::string& id) OVERRIDE; + const std::string& id) override; virtual const NotificationList::Notifications& GetVisibleNotifications() - OVERRIDE; - virtual NotificationList::PopupNotifications GetPopupNotifications() OVERRIDE; - virtual void AddNotification(scoped_ptr<Notification> notification) OVERRIDE; + override; + virtual NotificationList::PopupNotifications GetPopupNotifications() override; + virtual void AddNotification(scoped_ptr<Notification> notification) override; virtual void UpdateNotification(const std::string& old_id, scoped_ptr<Notification> new_notification) - OVERRIDE; + override; - virtual void RemoveNotification(const std::string& id, bool by_user) OVERRIDE; - virtual void RemoveAllNotifications(bool by_user) OVERRIDE; - virtual void RemoveAllVisibleNotifications(bool by_user) OVERRIDE; + virtual void RemoveNotification(const std::string& id, bool by_user) override; + virtual void RemoveAllNotifications(bool by_user) override; + virtual void RemoveAllVisibleNotifications(bool by_user) override; virtual void SetNotificationIcon(const std::string& notification_id, - const gfx::Image& image) OVERRIDE; + const gfx::Image& image) override; virtual void SetNotificationImage(const std::string& notification_id, - const gfx::Image& image) OVERRIDE; + const gfx::Image& image) override; virtual void SetNotificationButtonIcon(const std::string& notification_id, int button_index, - const gfx::Image& image) OVERRIDE; + const gfx::Image& image) override; virtual void DisableNotificationsByNotifier( - const NotifierId& notifier_id) OVERRIDE; - virtual void ClickOnNotification(const std::string& id) OVERRIDE; + const NotifierId& notifier_id) override; + virtual void ClickOnNotification(const std::string& id) override; virtual void ClickOnNotificationButton(const std::string& id, - int button_index) OVERRIDE; + int button_index) override; virtual void MarkSinglePopupAsShown(const std::string& id, - bool mark_notification_as_read) OVERRIDE; + bool mark_notification_as_read) override; virtual void DisplayedNotification( const std::string& id, - const DisplaySource source) OVERRIDE; + const DisplaySource source) override; virtual void SetNotifierSettingsProvider( - NotifierSettingsProvider* provider) OVERRIDE; - virtual NotifierSettingsProvider* GetNotifierSettingsProvider() OVERRIDE; - virtual void SetQuietMode(bool in_quiet_mode) OVERRIDE; + NotifierSettingsProvider* provider) override; + virtual NotifierSettingsProvider* GetNotifierSettingsProvider() override; + virtual void SetQuietMode(bool in_quiet_mode) override; virtual void EnterQuietModeWithExpire( - const base::TimeDelta& expires_in) OVERRIDE; - virtual void SetVisibility(Visibility visible) OVERRIDE; - virtual bool IsMessageCenterVisible() const OVERRIDE; - virtual void RestartPopupTimers() OVERRIDE; - virtual void PausePopupTimers() OVERRIDE; + const base::TimeDelta& expires_in) override; + virtual void SetVisibility(Visibility visible) override; + virtual bool IsMessageCenterVisible() const override; + virtual void RestartPopupTimers() override; + virtual void PausePopupTimers() override; protected: - virtual void DisableTimersForTest() OVERRIDE; + virtual void DisableTimersForTest() override; private: const NotificationList::Notifications empty_notifications_; diff --git a/ui/message_center/fake_message_center_tray_delegate.h b/ui/message_center/fake_message_center_tray_delegate.h index ff05c84..d03310b 100644 --- a/ui/message_center/fake_message_center_tray_delegate.h +++ b/ui/message_center/fake_message_center_tray_delegate.h @@ -27,15 +27,15 @@ class FakeMessageCenterTrayDelegate : public MessageCenterTrayDelegate { } // Overridden from MessageCenterTrayDelegate: - virtual void OnMessageCenterTrayChanged() OVERRIDE; - virtual bool ShowPopups() OVERRIDE; - virtual void HidePopups() OVERRIDE; - virtual bool ShowMessageCenter() OVERRIDE; - virtual void HideMessageCenter() OVERRIDE; - virtual bool ShowNotifierSettings() OVERRIDE; - virtual bool IsContextMenuEnabled() const OVERRIDE; - virtual MessageCenterTray* GetMessageCenterTray() OVERRIDE; - virtual void DisplayFirstRunBalloon() OVERRIDE; + virtual void OnMessageCenterTrayChanged() override; + virtual bool ShowPopups() override; + virtual void HidePopups() override; + virtual bool ShowMessageCenter() override; + virtual void HideMessageCenter() override; + virtual bool ShowNotifierSettings() override; + virtual bool IsContextMenuEnabled() const override; + virtual MessageCenterTray* GetMessageCenterTray() override; + virtual void DisplayFirstRunBalloon() override; private: scoped_ptr<MessageCenterTray> tray_; diff --git a/ui/message_center/fake_notifier_settings_provider.h b/ui/message_center/fake_notifier_settings_provider.h index 08f4d34..ebefda1 100644 --- a/ui/message_center/fake_notifier_settings_provider.h +++ b/ui/message_center/fake_notifier_settings_provider.h @@ -19,25 +19,25 @@ class FakeNotifierSettingsProvider : public NotifierSettingsProvider { const std::vector<Notifier*>& notifiers); virtual ~FakeNotifierSettingsProvider(); - virtual size_t GetNotifierGroupCount() const OVERRIDE; - virtual const NotifierGroup& GetNotifierGroupAt(size_t index) const OVERRIDE; - virtual bool IsNotifierGroupActiveAt(size_t index) const OVERRIDE; - virtual void SwitchToNotifierGroup(size_t index) OVERRIDE; - virtual const NotifierGroup& GetActiveNotifierGroup() const OVERRIDE; + virtual size_t GetNotifierGroupCount() const override; + virtual const NotifierGroup& GetNotifierGroupAt(size_t index) const override; + virtual bool IsNotifierGroupActiveAt(size_t index) const override; + virtual void SwitchToNotifierGroup(size_t index) override; + virtual const NotifierGroup& GetActiveNotifierGroup() const override; - virtual void GetNotifierList(std::vector<Notifier*>* notifiers) OVERRIDE; + virtual void GetNotifierList(std::vector<Notifier*>* notifiers) override; virtual void SetNotifierEnabled(const Notifier& notifier, - bool enabled) OVERRIDE; + bool enabled) override; - virtual void OnNotifierSettingsClosing() OVERRIDE; + virtual void OnNotifierSettingsClosing() override; virtual bool NotifierHasAdvancedSettings(const NotifierId& notifier_id) const - OVERRIDE; + override; virtual void OnNotifierAdvancedSettingsRequested( const NotifierId& notifier_id, - const std::string* notification_id) OVERRIDE; - virtual void AddObserver(NotifierSettingsObserver* observer) OVERRIDE; - virtual void RemoveObserver(NotifierSettingsObserver* observer) OVERRIDE; + const std::string* notification_id) override; + virtual void AddObserver(NotifierSettingsObserver* observer) override; + virtual void RemoveObserver(NotifierSettingsObserver* observer) override; bool WasEnabled(const Notifier& notifier); int closed_called_count(); diff --git a/ui/message_center/message_center_impl.h b/ui/message_center/message_center_impl.h index f48f5dc..9948089 100644 --- a/ui/message_center/message_center_impl.h +++ b/ui/message_center/message_center_impl.h @@ -88,10 +88,10 @@ class MESSAGE_CENTER_EXPORT PopupTimersController // MessageCenterObserver implementation. virtual void OnNotificationDisplayed( const std::string& id, - const DisplaySource source) OVERRIDE; - virtual void OnNotificationUpdated(const std::string& id) OVERRIDE; + const DisplaySource source) override; + virtual void OnNotificationUpdated(const std::string& id) override; virtual void OnNotificationRemoved(const std::string& id, bool by_user) - OVERRIDE; + override; // Callback for each timer when its time is up. virtual void TimerFinished(const std::string& id); @@ -145,67 +145,67 @@ class MessageCenterImpl : public MessageCenter, virtual ~MessageCenterImpl(); // MessageCenter overrides: - virtual void AddObserver(MessageCenterObserver* observer) OVERRIDE; - virtual void RemoveObserver(MessageCenterObserver* observer) OVERRIDE; - virtual void AddNotificationBlocker(NotificationBlocker* blocker) OVERRIDE; - virtual void RemoveNotificationBlocker(NotificationBlocker* blocker) OVERRIDE; - virtual void SetVisibility(Visibility visible) OVERRIDE; - virtual bool IsMessageCenterVisible() const OVERRIDE; - virtual size_t NotificationCount() const OVERRIDE; - virtual size_t UnreadNotificationCount() const OVERRIDE; - virtual bool HasPopupNotifications() const OVERRIDE; - virtual bool IsQuietMode() const OVERRIDE; - virtual bool HasClickedListener(const std::string& id) OVERRIDE; + virtual void AddObserver(MessageCenterObserver* observer) override; + virtual void RemoveObserver(MessageCenterObserver* observer) override; + virtual void AddNotificationBlocker(NotificationBlocker* blocker) override; + virtual void RemoveNotificationBlocker(NotificationBlocker* blocker) override; + virtual void SetVisibility(Visibility visible) override; + virtual bool IsMessageCenterVisible() const override; + virtual size_t NotificationCount() const override; + virtual size_t UnreadNotificationCount() const override; + virtual bool HasPopupNotifications() const override; + virtual bool IsQuietMode() const override; + virtual bool HasClickedListener(const std::string& id) override; virtual message_center::Notification* FindVisibleNotificationById( - const std::string& id) OVERRIDE; + const std::string& id) override; virtual const NotificationList::Notifications& GetVisibleNotifications() - OVERRIDE; - virtual NotificationList::PopupNotifications GetPopupNotifications() OVERRIDE; - virtual void AddNotification(scoped_ptr<Notification> notification) OVERRIDE; + override; + virtual NotificationList::PopupNotifications GetPopupNotifications() override; + virtual void AddNotification(scoped_ptr<Notification> notification) override; virtual void UpdateNotification(const std::string& old_id, scoped_ptr<Notification> new_notification) - OVERRIDE; - virtual void RemoveNotification(const std::string& id, bool by_user) OVERRIDE; - virtual void RemoveAllNotifications(bool by_user) OVERRIDE; - virtual void RemoveAllVisibleNotifications(bool by_user) OVERRIDE; + override; + virtual void RemoveNotification(const std::string& id, bool by_user) override; + virtual void RemoveAllNotifications(bool by_user) override; + virtual void RemoveAllVisibleNotifications(bool by_user) override; virtual void SetNotificationIcon(const std::string& notification_id, - const gfx::Image& image) OVERRIDE; + const gfx::Image& image) override; virtual void SetNotificationImage(const std::string& notification_id, - const gfx::Image& image) OVERRIDE; + const gfx::Image& image) override; virtual void SetNotificationButtonIcon(const std::string& notification_id, int button_index, - const gfx::Image& image) OVERRIDE; + const gfx::Image& image) override; virtual void DisableNotificationsByNotifier( - const NotifierId& notifier_id) OVERRIDE; - virtual void ClickOnNotification(const std::string& id) OVERRIDE; + const NotifierId& notifier_id) override; + virtual void ClickOnNotification(const std::string& id) override; virtual void ClickOnNotificationButton(const std::string& id, - int button_index) OVERRIDE; + int button_index) override; virtual void MarkSinglePopupAsShown(const std::string& id, - bool mark_notification_as_read) OVERRIDE; + bool mark_notification_as_read) override; virtual void DisplayedNotification( const std::string& id, - const DisplaySource source) OVERRIDE; + const DisplaySource source) override; virtual void SetNotifierSettingsProvider( - NotifierSettingsProvider* provider) OVERRIDE; - virtual NotifierSettingsProvider* GetNotifierSettingsProvider() OVERRIDE; - virtual void SetQuietMode(bool in_quiet_mode) OVERRIDE; + NotifierSettingsProvider* provider) override; + virtual NotifierSettingsProvider* GetNotifierSettingsProvider() override; + virtual void SetQuietMode(bool in_quiet_mode) override; virtual void EnterQuietModeWithExpire( - const base::TimeDelta& expires_in) OVERRIDE; - virtual void RestartPopupTimers() OVERRIDE; - virtual void PausePopupTimers() OVERRIDE; + const base::TimeDelta& expires_in) override; + virtual void RestartPopupTimers() override; + virtual void PausePopupTimers() override; // NotificationBlocker::Observer overrides: - virtual void OnBlockingStateChanged(NotificationBlocker* blocker) OVERRIDE; + virtual void OnBlockingStateChanged(NotificationBlocker* blocker) override; // message_center::NotifierSettingsObserver overrides: virtual void UpdateIconImage(const NotifierId& notifier_id, - const gfx::Image& icon) OVERRIDE; - virtual void NotifierGroupChanged() OVERRIDE; + const gfx::Image& icon) override; + virtual void NotifierGroupChanged() override; virtual void NotifierEnabledChanged(const NotifierId& notifier_id, - bool enabled) OVERRIDE; + bool enabled) override; protected: - virtual void DisableTimersForTest() OVERRIDE; + virtual void DisableTimersForTest() override; private: struct NotificationCache { diff --git a/ui/message_center/message_center_impl_unittest.cc b/ui/message_center/message_center_impl_unittest.cc index 913c8a2..f0453e5 100644 --- a/ui/message_center/message_center_impl_unittest.cc +++ b/ui/message_center/message_center_impl_unittest.cc @@ -27,7 +27,7 @@ class MessageCenterImplTest : public testing::Test, public: MessageCenterImplTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { MessageCenter::Initialize(); message_center_ = MessageCenter::Get(); loop_.reset(new base::MessageLoop); @@ -35,7 +35,7 @@ class MessageCenterImplTest : public testing::Test, closure_ = run_loop_->QuitClosure(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { run_loop_.reset(); loop_.reset(); message_center_ = NULL; @@ -118,7 +118,7 @@ class ToggledNotificationBlocker : public NotificationBlocker { // NotificationBlocker overrides: virtual bool ShouldShowNotificationAsPopup( - const message_center::NotifierId& notifier_id) const OVERRIDE { + const message_center::NotifierId& notifier_id) const override { return notifications_enabled_; } @@ -138,7 +138,7 @@ class PopupNotificationBlocker : public ToggledNotificationBlocker { // NotificationBlocker overrides: virtual bool ShouldShowNotificationAsPopup( - const NotifierId& notifier_id) const OVERRIDE { + const NotifierId& notifier_id) const override { return (notifier_id == allowed_notifier_) || ToggledNotificationBlocker::ShouldShowNotificationAsPopup(notifier_id); } @@ -158,7 +158,7 @@ class TotalNotificationBlocker : public PopupNotificationBlocker { // NotificationBlocker overrides: virtual bool ShouldShowNotification( - const NotifierId& notifier_id) const OVERRIDE { + const NotifierId& notifier_id) const override { return ShouldShowNotificationAsPopup(notifier_id); } @@ -202,7 +202,7 @@ class MockPopupTimersController : public PopupTimersController { quit_closure_(quit_closure) {} virtual ~MockPopupTimersController() {} - virtual void TimerFinished(const std::string& id) OVERRIDE { + virtual void TimerFinished(const std::string& id) override { base::MessageLoop::current()->PostTask(FROM_HERE, quit_closure_); timer_finished_ = true; last_id_ = id; diff --git a/ui/message_center/message_center_tray.cc b/ui/message_center/message_center_tray.cc index 3425ce5..3037c69 100644 --- a/ui/message_center/message_center_tray.cc +++ b/ui/message_center/message_center_tray.cc @@ -32,12 +32,12 @@ class NotificationMenuModel : public ui::SimpleMenuModel, virtual ~NotificationMenuModel(); // Overridden from ui::SimpleMenuModel::Delegate: - virtual bool IsCommandIdChecked(int command_id) const OVERRIDE; - virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE; + virtual bool IsCommandIdChecked(int command_id) const override; + virtual bool IsCommandIdEnabled(int command_id) const override; virtual bool GetAcceleratorForCommandId( int command_id, - ui::Accelerator* accelerator) OVERRIDE; - virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE; + ui::Accelerator* accelerator) override; + virtual void ExecuteCommand(int command_id, int event_flags) override; private: MessageCenterTray* tray_; diff --git a/ui/message_center/message_center_tray.h b/ui/message_center/message_center_tray.h index 4539417..6e81409 100644 --- a/ui/message_center/message_center_tray.h +++ b/ui/message_center/message_center_tray.h @@ -74,21 +74,21 @@ class MESSAGE_CENTER_EXPORT MessageCenterTray : public MessageCenterObserver { message_center::MessageCenter* message_center() { return message_center_; } // Overridden from MessageCenterObserver: - virtual void OnNotificationAdded(const std::string& notification_id) OVERRIDE; + virtual void OnNotificationAdded(const std::string& notification_id) override; virtual void OnNotificationRemoved(const std::string& notification_id, - bool by_user) OVERRIDE; + bool by_user) override; virtual void OnNotificationUpdated( - const std::string& notification_id) OVERRIDE; + const std::string& notification_id) override; virtual void OnNotificationClicked( - const std::string& notification_id) OVERRIDE; + const std::string& notification_id) override; virtual void OnNotificationButtonClicked( const std::string& notification_id, - int button_index) OVERRIDE; + int button_index) override; virtual void OnNotificationDisplayed( const std::string& notification_id, - const DisplaySource source) OVERRIDE; - virtual void OnQuietModeChanged(bool in_quiet_mode) OVERRIDE; - virtual void OnBlockingStateChanged(NotificationBlocker* blocker) OVERRIDE; + const DisplaySource source) override; + virtual void OnQuietModeChanged(bool in_quiet_mode) override; + virtual void OnBlockingStateChanged(NotificationBlocker* blocker) override; private: void OnMessageCenterChanged(); diff --git a/ui/message_center/message_center_tray_unittest.cc b/ui/message_center/message_center_tray_unittest.cc index 993e188..cf1fcee 100644 --- a/ui/message_center/message_center_tray_unittest.cc +++ b/ui/message_center/message_center_tray_unittest.cc @@ -23,23 +23,23 @@ class MockDelegate : public MessageCenterTrayDelegate { show_message_center_success_(true), enable_context_menu_(true) {} virtual ~MockDelegate() {} - virtual void OnMessageCenterTrayChanged() OVERRIDE {} - virtual bool ShowPopups() OVERRIDE { + virtual void OnMessageCenterTrayChanged() override {} + virtual bool ShowPopups() override { return show_message_center_success_; } - virtual void HidePopups() OVERRIDE {} - virtual bool ShowMessageCenter() OVERRIDE { + virtual void HidePopups() override {} + virtual bool ShowMessageCenter() override { return show_popups_success_; } - virtual void HideMessageCenter() OVERRIDE {} - virtual bool ShowNotifierSettings() OVERRIDE { + virtual void HideMessageCenter() override {} + virtual bool ShowNotifierSettings() override { return true; } - virtual bool IsContextMenuEnabled() const OVERRIDE { + virtual bool IsContextMenuEnabled() const override { return enable_context_menu_; } - virtual MessageCenterTray* GetMessageCenterTray() OVERRIDE { + virtual MessageCenterTray* GetMessageCenterTray() override { return NULL; } diff --git a/ui/message_center/notification_delegate.h b/ui/message_center/notification_delegate.h index 9c6c8a1..2faf2d0 100644 --- a/ui/message_center/notification_delegate.h +++ b/ui/message_center/notification_delegate.h @@ -59,12 +59,12 @@ class MESSAGE_CENTER_EXPORT HandleNotificationClickedDelegate explicit HandleNotificationClickedDelegate(const base::Closure& closure); // message_center::NotificationDelegate overrides: - virtual void Display() OVERRIDE; - virtual void Error() OVERRIDE; - virtual void Close(bool by_user) OVERRIDE; - virtual bool HasClickedListener() OVERRIDE; - virtual void Click() OVERRIDE; - virtual void ButtonClick(int button_index) OVERRIDE; + virtual void Display() override; + virtual void Error() override; + virtual void Close(bool by_user) override; + virtual bool HasClickedListener() override; + virtual void Click() override; + virtual void ButtonClick(int button_index) override; protected: virtual ~HandleNotificationClickedDelegate(); @@ -87,11 +87,11 @@ class MESSAGE_CENTER_EXPORT HandleNotificationButtonClickDelegate const ButtonClickCallback& button_callback); // message_center::NotificationDelegate overrides: - virtual void Display() OVERRIDE; - virtual void Error() OVERRIDE; - virtual void Close(bool by_user) OVERRIDE; - virtual void Click() OVERRIDE; - virtual void ButtonClick(int button_index) OVERRIDE; + virtual void Display() override; + virtual void Error() override; + virtual void Close(bool by_user) override; + virtual void Click() override; + virtual void ButtonClick(int button_index) override; protected: virtual ~HandleNotificationButtonClickDelegate(); diff --git a/ui/message_center/test/run_all_unittests.cc b/ui/message_center/test/run_all_unittests.cc index f657e04..274b1767 100644 --- a/ui/message_center/test/run_all_unittests.cc +++ b/ui/message_center/test/run_all_unittests.cc @@ -23,7 +23,7 @@ class MessageCenterTestSuite : public base::TestSuite { MessageCenterTestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {} protected: - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { #if !defined(OS_MACOSX) gfx::GLSurface::InitializeOneOffForTests(); #endif @@ -35,7 +35,7 @@ class MessageCenterTestSuite : public base::TestSuite { ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path); } - virtual void Shutdown() OVERRIDE { + virtual void Shutdown() override { ui::ResourceBundle::CleanupSharedInstance(); base::TestSuite::Shutdown(); } diff --git a/ui/message_center/views/bounded_label.cc b/ui/message_center/views/bounded_label.cc index abbdcf3..f6b2fe2 100644 --- a/ui/message_center/views/bounded_label.cc +++ b/ui/message_center/views/bounded_label.cc @@ -44,12 +44,12 @@ class InnerBoundedLabel : public views::Label { std::vector<base::string16> GetWrappedText(int width, int lines); // Overridden from views::Label. - virtual void SetText(const base::string16& text) OVERRIDE; + virtual void SetText(const base::string16& text) override; protected: // Overridden from views::Label. - virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) override; + virtual void OnPaint(gfx::Canvas* canvas) override; private: int GetTextFlags(); diff --git a/ui/message_center/views/bounded_label.h b/ui/message_center/views/bounded_label.h index 9a9e6d4..d67d5c5 100644 --- a/ui/message_center/views/bounded_label.h +++ b/ui/message_center/views/bounded_label.h @@ -50,18 +50,18 @@ class MESSAGE_CENTER_EXPORT BoundedLabel : public views::View { gfx::Size GetSizeForWidthAndLines(int width, int lines); // views::View: - virtual int GetBaseline() const OVERRIDE; - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual int GetHeightForWidth(int width) const OVERRIDE; + virtual int GetBaseline() const override; + virtual gfx::Size GetPreferredSize() const override; + virtual int GetHeightForWidth(int width) const override; virtual void Paint(gfx::Canvas* canvas, - const views::CullSet& cull_set) OVERRIDE; - virtual bool CanProcessEventsWithinSubtree() const OVERRIDE; - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; + const views::CullSet& cull_set) override; + virtual bool CanProcessEventsWithinSubtree() const override; + virtual void GetAccessibleState(ui::AXViewState* state) override; protected: // Overridden from views::View. - virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE; - virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) OVERRIDE; + virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) override; + virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) override; private: friend class test::BoundedLabelTest; diff --git a/ui/message_center/views/desktop_popup_alignment_delegate.h b/ui/message_center/views/desktop_popup_alignment_delegate.h index d00dbba..1e126d8 100644 --- a/ui/message_center/views/desktop_popup_alignment_delegate.h +++ b/ui/message_center/views/desktop_popup_alignment_delegate.h @@ -30,12 +30,12 @@ class MESSAGE_CENTER_EXPORT DesktopPopupAlignmentDelegate void StartObserving(gfx::Screen* screen); // Overridden from PopupAlignmentDelegate: - virtual int GetToastOriginX(const gfx::Rect& toast_bounds) const OVERRIDE; - virtual int GetBaseLine() const OVERRIDE; - virtual int GetWorkAreaBottom() const OVERRIDE; - virtual bool IsTopDown() const OVERRIDE; - virtual bool IsFromLeft() const OVERRIDE; - virtual void RecomputeAlignment(const gfx::Display& display) OVERRIDE; + virtual int GetToastOriginX(const gfx::Rect& toast_bounds) const override; + virtual int GetBaseLine() const override; + virtual int GetWorkAreaBottom() const override; + virtual bool IsTopDown() const override; + virtual bool IsFromLeft() const override; + virtual void RecomputeAlignment(const gfx::Display& display) override; private: friend class test::MessagePopupCollectionTest; @@ -48,10 +48,10 @@ class MESSAGE_CENTER_EXPORT DesktopPopupAlignmentDelegate }; // Overridden from gfx::DisplayObserver: - virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE; - virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE; + virtual void OnDisplayAdded(const gfx::Display& new_display) override; + virtual void OnDisplayRemoved(const gfx::Display& old_display) override; virtual void OnDisplayMetricsChanged(const gfx::Display& display, - uint32_t metrics) OVERRIDE; + uint32_t metrics) override; int32_t alignment_; int64_t display_id_; diff --git a/ui/message_center/views/message_center_bubble.cc b/ui/message_center/views/message_center_bubble.cc index 273d1ef..7f0d6e8 100644 --- a/ui/message_center/views/message_center_bubble.cc +++ b/ui/message_center/views/message_center_bubble.cc @@ -22,11 +22,11 @@ class ContentsView : public views::View { virtual ~ContentsView(); // Overridden from views::View: - virtual int GetHeightForWidth(int width) const OVERRIDE; + virtual int GetHeightForWidth(int width) const override; protected: // Overridden from views::View: - virtual void ChildPreferredSizeChanged(View* child) OVERRIDE; + virtual void ChildPreferredSizeChanged(View* child) override; private: base::WeakPtr<MessageCenterBubble> bubble_; diff --git a/ui/message_center/views/message_center_bubble.h b/ui/message_center/views/message_center_bubble.h index 1173a95..5febb18 100644 --- a/ui/message_center/views/message_center_bubble.h +++ b/ui/message_center/views/message_center_bubble.h @@ -29,16 +29,16 @@ class MESSAGE_CENTER_EXPORT MessageCenterBubble void SetSettingsVisible(); // Overridden from views::WidgetObserver: - virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE; + virtual void OnWidgetClosing(views::Widget* widget) override; // Overridden from MessageBubbleBase: virtual views::TrayBubbleView::InitParams GetInitParams( - views::TrayBubbleView::AnchorAlignment anchor_alignment) OVERRIDE; - virtual void InitializeContents(views::TrayBubbleView* bubble_view) OVERRIDE; - virtual void OnBubbleViewDestroyed() OVERRIDE; - virtual void UpdateBubbleView() OVERRIDE; - virtual void OnMouseEnteredView() OVERRIDE; - virtual void OnMouseExitedView() OVERRIDE; + views::TrayBubbleView::AnchorAlignment anchor_alignment) override; + virtual void InitializeContents(views::TrayBubbleView* bubble_view) override; + virtual void OnBubbleViewDestroyed() override; + virtual void UpdateBubbleView() override; + virtual void OnMouseEnteredView() override; + virtual void OnMouseExitedView() override; size_t NumMessageViewsForTest() const; diff --git a/ui/message_center/views/message_center_button_bar.cc b/ui/message_center/views/message_center_button_bar.cc index eb5f11e..b56ab68 100644 --- a/ui/message_center/views/message_center_button_bar.cc +++ b/ui/message_center/views/message_center_button_bar.cc @@ -50,7 +50,7 @@ class NotificationCenterButton : public views::ToggleImageButton { protected: // Overridden from views::View: - virtual gfx::Size GetPreferredSize() const OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; private: gfx::Size size_; diff --git a/ui/message_center/views/message_center_button_bar.h b/ui/message_center/views/message_center_button_bar.h index bc87dbe..a02df8c 100644 --- a/ui/message_center/views/message_center_button_bar.h +++ b/ui/message_center/views/message_center_button_bar.h @@ -50,11 +50,11 @@ class MessageCenterButtonBar : public views::View, void ViewVisibilityChanged(); // Overridden from views::View: - virtual void ChildVisibilityChanged(views::View* child) OVERRIDE; + virtual void ChildVisibilityChanged(views::View* child) override; // Overridden from views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) OVERRIDE; + const ui::Event& event) override; MessageCenterView* message_center_view() const { return message_center_view_; diff --git a/ui/message_center/views/message_center_view.cc b/ui/message_center/views/message_center_view.cc index 5b3ee28..d726b61 100644 --- a/ui/message_center/views/message_center_view.cc +++ b/ui/message_center/views/message_center_view.cc @@ -62,9 +62,9 @@ class NoNotificationMessageView : public views::View { virtual ~NoNotificationMessageView(); // Overridden from views::View. - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual int GetHeightForWidth(int width) const OVERRIDE; - virtual void Layout() OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual int GetHeightForWidth(int width) const override; + virtual void Layout() override; private: views::Label* label_; @@ -121,17 +121,17 @@ class MessageListView : public views::View, protected: // Overridden from views::View. - virtual void Layout() OVERRIDE; - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual int GetHeightForWidth(int width) const OVERRIDE; + virtual void Layout() override; + virtual gfx::Size GetPreferredSize() const override; + virtual int GetHeightForWidth(int width) const override; virtual void PaintChildren(gfx::Canvas* canvas, - const views::CullSet& cull_set) OVERRIDE; - virtual void ReorderChildLayers(ui::Layer* parent_layer) OVERRIDE; + const views::CullSet& cull_set) override; + virtual void ReorderChildLayers(ui::Layer* parent_layer) override; // Overridden from views::BoundsAnimatorObserver. virtual void OnBoundsAnimatorProgressed( - views::BoundsAnimator* animator) OVERRIDE; - virtual void OnBoundsAnimatorDone(views::BoundsAnimator* animator) OVERRIDE; + views::BoundsAnimator* animator) override; + virtual void OnBoundsAnimatorDone(views::BoundsAnimator* animator) override; private: bool IsValidChild(const views::View* child) const; diff --git a/ui/message_center/views/message_center_view.h b/ui/message_center/views/message_center_view.h index 94dd139..6f72e91 100644 --- a/ui/message_center/views/message_center_view.h +++ b/ui/message_center/views/message_center_view.h @@ -68,33 +68,33 @@ class MESSAGE_CENTER_EXPORT MessageCenterView : public views::View, protected: // Overridden from views::View: - virtual void Layout() OVERRIDE; - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual int GetHeightForWidth(int width) const OVERRIDE; - virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) OVERRIDE; - virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE; + virtual void Layout() override; + virtual gfx::Size GetPreferredSize() const override; + virtual int GetHeightForWidth(int width) const override; + virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) override; + virtual void OnMouseExited(const ui::MouseEvent& event) override; // Overridden from MessageCenterObserver: - virtual void OnNotificationAdded(const std::string& id) OVERRIDE; + virtual void OnNotificationAdded(const std::string& id) override; virtual void OnNotificationRemoved(const std::string& id, - bool by_user) OVERRIDE; - virtual void OnNotificationUpdated(const std::string& id) OVERRIDE; + bool by_user) override; + virtual void OnNotificationUpdated(const std::string& id) override; // Overridden from MessageCenterController: - virtual void ClickOnNotification(const std::string& notification_id) OVERRIDE; + virtual void ClickOnNotification(const std::string& notification_id) override; virtual void RemoveNotification(const std::string& notification_id, - bool by_user) OVERRIDE; + bool by_user) override; virtual scoped_ptr<ui::MenuModel> CreateMenuModel( const NotifierId& notifier_id, - const base::string16& display_source) OVERRIDE; - virtual bool HasClickedListener(const std::string& notification_id) OVERRIDE; + const base::string16& display_source) override; + virtual bool HasClickedListener(const std::string& notification_id) override; virtual void ClickOnNotificationButton(const std::string& notification_id, - int button_index) OVERRIDE; + int button_index) override; // Overridden from gfx::AnimationDelegate: - virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE; - virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE; - virtual void AnimationCanceled(const gfx::Animation* animation) OVERRIDE; + virtual void AnimationEnded(const gfx::Animation* animation) override; + virtual void AnimationProgressed(const gfx::Animation* animation) override; + virtual void AnimationCanceled(const gfx::Animation* animation) override; private: friend class MessageCenterViewTest; diff --git a/ui/message_center/views/message_center_view_unittest.cc b/ui/message_center/views/message_center_view_unittest.cc index 3335ed8..6941927 100644 --- a/ui/message_center/views/message_center_view_unittest.cc +++ b/ui/message_center/views/message_center_view_unittest.cc @@ -40,9 +40,9 @@ class MockNotificationView : public NotificationView { Test* test); virtual ~MockNotificationView(); - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual int GetHeightForWidth(int w) const OVERRIDE; - virtual void Layout() OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual int GetHeightForWidth(int w) const override; + virtual void Layout() override; private: Test* test_; @@ -87,26 +87,26 @@ class MessageCenterViewTest : public testing::Test, MessageCenterViewTest(); virtual ~MessageCenterViewTest(); - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; MessageCenterView* GetMessageCenterView(); int GetNotificationCount(); int GetCallCount(CallType type); // Overridden from MessageCenterController: - virtual void ClickOnNotification(const std::string& notification_id) OVERRIDE; + virtual void ClickOnNotification(const std::string& notification_id) override; virtual void RemoveNotification(const std::string& notification_id, - bool by_user) OVERRIDE; + bool by_user) override; virtual scoped_ptr<ui::MenuModel> CreateMenuModel( const NotifierId& notifier_id, - const base::string16& display_source) OVERRIDE; - virtual bool HasClickedListener(const std::string& notification_id) OVERRIDE; + const base::string16& display_source) override; + virtual bool HasClickedListener(const std::string& notification_id) override; virtual void ClickOnNotificationButton(const std::string& notification_id, - int button_index) OVERRIDE; + int button_index) override; // Overridden from MockNotificationView::Test - virtual void RegisterCall(CallType type) OVERRIDE; + virtual void RegisterCall(CallType type) override; void LogBounds(int depth, views::View* view); diff --git a/ui/message_center/views/message_popup_collection.h b/ui/message_center/views/message_popup_collection.h index 8d6d644..f015319 100644 --- a/ui/message_center/views/message_popup_collection.h +++ b/ui/message_center/views/message_popup_collection.h @@ -62,15 +62,15 @@ class MESSAGE_CENTER_EXPORT MessagePopupCollection virtual ~MessagePopupCollection(); // Overridden from MessageCenterController: - virtual void ClickOnNotification(const std::string& notification_id) OVERRIDE; + virtual void ClickOnNotification(const std::string& notification_id) override; virtual void RemoveNotification(const std::string& notification_id, - bool by_user) OVERRIDE; + bool by_user) override; virtual scoped_ptr<ui::MenuModel> CreateMenuModel( const NotifierId& notifier_id, - const base::string16& display_source) OVERRIDE; - virtual bool HasClickedListener(const std::string& notification_id) OVERRIDE; + const base::string16& display_source) override; + virtual bool HasClickedListener(const std::string& notification_id) override; virtual void ClickOnNotificationButton(const std::string& notification_id, - int button_index) OVERRIDE; + int button_index) override; void MarkAllPopupsShown(); @@ -128,11 +128,11 @@ class MESSAGE_CENTER_EXPORT MessagePopupCollection int GetBaseLine(ToastContentsView* last_toast) const; // Overridden from MessageCenterObserver: - virtual void OnNotificationAdded(const std::string& notification_id) OVERRIDE; + virtual void OnNotificationAdded(const std::string& notification_id) override; virtual void OnNotificationRemoved(const std::string& notification_id, - bool by_user) OVERRIDE; + bool by_user) override; virtual void OnNotificationUpdated( - const std::string& notification_id) OVERRIDE; + const std::string& notification_id) override; ToastContentsView* FindToast(const std::string& notification_id) const; diff --git a/ui/message_center/views/message_popup_collection_unittest.cc b/ui/message_center/views/message_popup_collection_unittest.cc index 551e4dd..6aa0736 100644 --- a/ui/message_center/views/message_popup_collection_unittest.cc +++ b/ui/message_center/views/message_popup_collection_unittest.cc @@ -26,7 +26,7 @@ namespace test { class MessagePopupCollectionTest : public views::ViewsTestBase { public: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { views::ViewsTestBase::SetUp(); MessageCenter::Initialize(); MessageCenter::Get()->DisableTimersForTest(); @@ -42,7 +42,7 @@ class MessagePopupCollectionTest : public views::ViewsTestBase { PrepareForWait(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { collection_.reset(); MessageCenter::Shutdown(); views::ViewsTestBase::TearDown(); diff --git a/ui/message_center/views/message_view.h b/ui/message_center/views/message_view.h index 1bf8aee..0c0d3c54 100644 --- a/ui/message_center/views/message_view.h +++ b/ui/message_center/views/message_view.h @@ -74,21 +74,21 @@ class MESSAGE_CENTER_EXPORT MessageView : public views::SlideOutView, } // Overridden from views::View: - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; - virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; - virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE; - virtual bool OnKeyReleased(const ui::KeyEvent& event) OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; - virtual void OnFocus() OVERRIDE; - virtual void OnBlur() OVERRIDE; - virtual void Layout() OVERRIDE; + virtual void GetAccessibleState(ui::AXViewState* state) override; + virtual bool OnMousePressed(const ui::MouseEvent& event) override; + virtual bool OnKeyPressed(const ui::KeyEvent& event) override; + virtual bool OnKeyReleased(const ui::KeyEvent& event) override; + virtual void OnPaint(gfx::Canvas* canvas) override; + virtual void OnFocus() override; + virtual void OnBlur() override; + virtual void Layout() override; // Overridden from ui::EventHandler: - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; + virtual void OnGestureEvent(ui::GestureEvent* event) override; // Overridden from ButtonListener: virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) OVERRIDE; + const ui::Event& event) override; void set_scroller(views::ScrollView* scroller) { scroller_ = scroller; } std::string notification_id() { return notification_id_; } @@ -97,7 +97,7 @@ class MESSAGE_CENTER_EXPORT MessageView : public views::SlideOutView, protected: // Overridden from views::SlideOutView: - virtual void OnSlideOut() OVERRIDE; + virtual void OnSlideOut() override; views::ImageView* small_image() { return small_image_view_.get(); } views::ImageButton* close_button() { return close_button_.get(); } diff --git a/ui/message_center/views/message_view_context_menu_controller.h b/ui/message_center/views/message_view_context_menu_controller.h index 5ee39de..7c41259 100644 --- a/ui/message_center/views/message_view_context_menu_controller.h +++ b/ui/message_center/views/message_view_context_menu_controller.h @@ -22,7 +22,7 @@ class MessageViewContextMenuController : public views::ContextMenuController { // Overridden from views::ContextMenuController: virtual void ShowContextMenuForView(views::View* source, const gfx::Point& point, - ui::MenuSourceType source_type) OVERRIDE; + ui::MenuSourceType source_type) override; MessageCenterController* controller_; diff --git a/ui/message_center/views/notification_button.h b/ui/message_center/views/notification_button.h index b5ac0f1..347964a 100644 --- a/ui/message_center/views/notification_button.h +++ b/ui/message_center/views/notification_button.h @@ -27,16 +27,16 @@ class NotificationButton : public views::CustomButton { void SetTitle(const base::string16& title); // Overridden from views::View: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual int GetHeightForWidth(int width) const OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; - virtual void OnFocus() OVERRIDE; - virtual void OnBlur() OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual int GetHeightForWidth(int width) const override; + virtual void OnPaint(gfx::Canvas* canvas) override; + virtual void OnFocus() override; + virtual void OnBlur() override; virtual void ViewHierarchyChanged( - const ViewHierarchyChangedDetails& details) OVERRIDE; + const ViewHierarchyChangedDetails& details) override; // Overridden from views::CustomButton: - virtual void StateChanged() OVERRIDE; + virtual void StateChanged() override; private: views::ImageView* icon_; diff --git a/ui/message_center/views/notification_view.cc b/ui/message_center/views/notification_view.cc index 81cfcd1..208a386 100644 --- a/ui/message_center/views/notification_view.cc +++ b/ui/message_center/views/notification_view.cc @@ -115,7 +115,7 @@ class ItemView : public views::View { virtual ~ItemView(); // Overridden from views::View: - virtual void SetVisible(bool visible) OVERRIDE; + virtual void SetVisible(bool visible) override; private: DISALLOW_COPY_AND_ASSIGN(ItemView); @@ -194,8 +194,8 @@ class NotificationProgressBar : public views::ProgressBar { private: // Overriden from View - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual void OnPaint(gfx::Canvas* canvas) override; DISALLOW_COPY_AND_ASSIGN(NotificationProgressBar); }; diff --git a/ui/message_center/views/notification_view.h b/ui/message_center/views/notification_view.h index 623f120..0cb6444 100644 --- a/ui/message_center/views/notification_view.h +++ b/ui/message_center/views/notification_view.h @@ -46,23 +46,23 @@ class MESSAGE_CENTER_EXPORT NotificationView virtual ~NotificationView(); // Overridden from views::View: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual int GetHeightForWidth(int width) const OVERRIDE; - virtual void Layout() OVERRIDE; - virtual void OnFocus() OVERRIDE; - virtual void ScrollRectToVisible(const gfx::Rect& rect) OVERRIDE; - virtual gfx::NativeCursor GetCursor(const ui::MouseEvent& event) OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual int GetHeightForWidth(int width) const override; + virtual void Layout() override; + virtual void OnFocus() override; + virtual void ScrollRectToVisible(const gfx::Rect& rect) override; + virtual gfx::NativeCursor GetCursor(const ui::MouseEvent& event) override; // Overridden from MessageView: virtual void UpdateWithNotification( - const Notification& notification) OVERRIDE; + const Notification& notification) override; virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) OVERRIDE; + const ui::Event& event) override; // Overridden from MessageViewController: - virtual void ClickOnNotification(const std::string& notification_id) OVERRIDE; + virtual void ClickOnNotification(const std::string& notification_id) override; virtual void RemoveNotification(const std::string& notification_id, - bool by_user) OVERRIDE; + bool by_user) override; void set_controller(MessageCenterController* controller) { controller_ = controller; @@ -82,7 +82,7 @@ class MESSAGE_CENTER_EXPORT NotificationView // views::ViewTargeterDelegate: virtual views::View* TargetForRect(views::View* root, - const gfx::Rect& rect) OVERRIDE; + const gfx::Rect& rect) override; void CreateOrUpdateViews(const Notification& notification); void SetAccessibleName(const Notification& notification); diff --git a/ui/message_center/views/notification_view_unittest.cc b/ui/message_center/views/notification_view_unittest.cc index 6e85301..1937618 100644 --- a/ui/message_center/views/notification_view_unittest.cc +++ b/ui/message_center/views/notification_view_unittest.cc @@ -28,8 +28,8 @@ class NotificationViewTest : public views::ViewsTestBase, NotificationViewTest(); virtual ~NotificationViewTest(); - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; views::Widget* widget() { return notification_view_->GetWidget(); } NotificationView* notification_view() { return notification_view_.get(); } @@ -37,15 +37,15 @@ class NotificationViewTest : public views::ViewsTestBase, RichNotificationData* data() { return data_.get(); } // Overridden from MessageCenterController: - virtual void ClickOnNotification(const std::string& notification_id) OVERRIDE; + virtual void ClickOnNotification(const std::string& notification_id) override; virtual void RemoveNotification(const std::string& notification_id, - bool by_user) OVERRIDE; + bool by_user) override; virtual scoped_ptr<ui::MenuModel> CreateMenuModel( const NotifierId& notifier_id, - const base::string16& display_source) OVERRIDE; - virtual bool HasClickedListener(const std::string& notification_id) OVERRIDE; + const base::string16& display_source) override; + virtual bool HasClickedListener(const std::string& notification_id) override; virtual void ClickOnNotificationButton(const std::string& notification_id, - int button_index) OVERRIDE; + int button_index) override; protected: const gfx::Image CreateTestImage(int width, int height) { diff --git a/ui/message_center/views/notifier_settings_view.cc b/ui/message_center/views/notifier_settings_view.cc index cbe285b..4f24a8c 100644 --- a/ui/message_center/views/notifier_settings_view.cc +++ b/ui/message_center/views/notifier_settings_view.cc @@ -129,14 +129,14 @@ class EntryView : public views::View { virtual ~EntryView(); // views::View: - virtual void Layout() OVERRIDE; - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; - virtual void OnFocus() OVERRIDE; - virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE; - virtual bool OnKeyReleased(const ui::KeyEvent& event) OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; - virtual void OnBlur() OVERRIDE; + virtual void Layout() override; + virtual gfx::Size GetPreferredSize() const override; + virtual void GetAccessibleState(ui::AXViewState* state) override; + virtual void OnFocus() override; + virtual bool OnKeyPressed(const ui::KeyEvent& event) override; + virtual bool OnKeyReleased(const ui::KeyEvent& event) override; + virtual void OnPaint(gfx::Canvas* canvas) override; + virtual void OnBlur() override; private: scoped_ptr<views::Painter> focus_painter_; @@ -210,12 +210,12 @@ class NotifierGroupMenuModel : public ui::SimpleMenuModel, virtual ~NotifierGroupMenuModel(); // ui::SimpleMenuModel::Delegate: - virtual bool IsCommandIdChecked(int command_id) const OVERRIDE; - virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE; + virtual bool IsCommandIdChecked(int command_id) const override; + virtual bool IsCommandIdEnabled(int command_id) const override; virtual bool GetAcceleratorForCommandId( int command_id, - ui::Accelerator* accelerator) OVERRIDE; - virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE; + ui::Accelerator* accelerator) override; + virtual void ExecuteCommand(int command_id, int event_flags) override; private: NotifierSettingsProvider* notifier_settings_provider_; diff --git a/ui/message_center/views/notifier_settings_view.h b/ui/message_center/views/notifier_settings_view.h index 994fa50..ef60a06 100644 --- a/ui/message_center/views/notifier_settings_view.h +++ b/ui/message_center/views/notifier_settings_view.h @@ -41,10 +41,10 @@ class MESSAGE_CENTER_EXPORT NotifierSettingsView // Overridden from NotifierSettingsDelegate: virtual void UpdateIconImage(const NotifierId& notifier_id, - const gfx::Image& icon) OVERRIDE; - virtual void NotifierGroupChanged() OVERRIDE; + const gfx::Image& icon) override; + virtual void NotifierGroupChanged() override; virtual void NotifierEnabledChanged(const NotifierId& notifier_id, - bool enabled) OVERRIDE; + bool enabled) override; void set_provider(NotifierSettingsProvider* new_provider) { provider_ = new_provider; @@ -72,8 +72,8 @@ class MESSAGE_CENTER_EXPORT NotifierSettingsView private: // Overridden from views::ButtonListener: virtual void ButtonPressed(views::Button* button, - const ui::Event& event) OVERRIDE; - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; + const ui::Event& event) override; + virtual void GetAccessibleState(ui::AXViewState* state) override; bool ShouldHaveLearnMoreButton() const; // Helper function to reset the layout when the view has substantially @@ -96,19 +96,19 @@ class MESSAGE_CENTER_EXPORT NotifierSettingsView void UpdateContentsView(const std::vector<Notifier*>& notifiers); // Overridden from views::View: - virtual void Layout() OVERRIDE; - virtual gfx::Size GetMinimumSize() const OVERRIDE; - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE; - virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) OVERRIDE; + virtual void Layout() override; + virtual gfx::Size GetMinimumSize() const override; + virtual gfx::Size GetPreferredSize() const override; + virtual bool OnKeyPressed(const ui::KeyEvent& event) override; + virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) override; // Overridden from views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) OVERRIDE; + const ui::Event& event) override; // Overridden from views::MenuButtonListener: virtual void OnMenuButtonClicked(views::View* source, - const gfx::Point& point) OVERRIDE; + const gfx::Point& point) override; views::ImageButton* title_arrow_; views::Label* title_label_; diff --git a/ui/message_center/views/notifier_settings_view_unittest.cc b/ui/message_center/views/notifier_settings_view_unittest.cc index 331bd957..df9ce16 100644 --- a/ui/message_center/views/notifier_settings_view_unittest.cc +++ b/ui/message_center/views/notifier_settings_view_unittest.cc @@ -31,13 +31,13 @@ class TestingNotifierSettingsProvider virtual ~TestingNotifierSettingsProvider() {} virtual bool NotifierHasAdvancedSettings(const NotifierId& notifier_id) const - OVERRIDE { + override { return notifier_id == settings_handler_id_; } virtual void OnNotifierAdvancedSettingsRequested( const NotifierId& notifier_id, - const std::string* notification_id) OVERRIDE { + const std::string* notification_id) override { request_count_++; last_notifier_id_settings_requested_.reset(new NotifierId(notifier_id)); } @@ -60,8 +60,8 @@ class NotifierSettingsViewTest : public testing::Test { NotifierSettingsViewTest(); virtual ~NotifierSettingsViewTest(); - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; NotifierSettingsView* GetView() const; TestingNotifierSettingsProvider* settings_provider() const { diff --git a/ui/message_center/views/padded_button.h b/ui/message_center/views/padded_button.h index c420621..ccb2590 100644 --- a/ui/message_center/views/padded_button.h +++ b/ui/message_center/views/padded_button.h @@ -24,9 +24,9 @@ class PaddedButton : public views::ImageButton { virtual ~PaddedButton(); // Overridden from views::ImageButton: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; - virtual void OnFocus() OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual void OnPaint(gfx::Canvas* canvas) override; + virtual void OnFocus() override; // The SetPadding() method also sets the button's image alignment (positive // values yield left/top alignments, negative values yield right/bottom ones, diff --git a/ui/message_center/views/proportional_image_view.h b/ui/message_center/views/proportional_image_view.h index 7c1be92..f92b4d8 100644 --- a/ui/message_center/views/proportional_image_view.h +++ b/ui/message_center/views/proportional_image_view.h @@ -17,9 +17,9 @@ class ProportionalImageView : public views::View { virtual ~ProportionalImageView(); // Overridden from views::View: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual int GetHeightForWidth(int width) const OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual int GetHeightForWidth(int width) const override; + virtual void OnPaint(gfx::Canvas* canvas) override; private: gfx::Size GetImageDrawingSize(); diff --git a/ui/message_center/views/toast_contents_view.h b/ui/message_center/views/toast_contents_view.h index 1b39d81..4ebcd17 100644 --- a/ui/message_center/views/toast_contents_view.h +++ b/ui/message_center/views/toast_contents_view.h @@ -71,34 +71,34 @@ class ToastContentsView : public views::WidgetDelegateView, const std::string& id() { return id_; } // Overridden from views::View: - virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE; - virtual void Layout() OVERRIDE; - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; + virtual void OnMouseEntered(const ui::MouseEvent& event) override; + virtual void OnMouseExited(const ui::MouseEvent& event) override; + virtual void Layout() override; + virtual gfx::Size GetPreferredSize() const override; + virtual void GetAccessibleState(ui::AXViewState* state) override; private: // Overridden from MessageCenterController: - virtual void ClickOnNotification(const std::string& notification_id) OVERRIDE; + virtual void ClickOnNotification(const std::string& notification_id) override; virtual void RemoveNotification(const std::string& notification_id, - bool by_user) OVERRIDE; + bool by_user) override; virtual scoped_ptr<ui::MenuModel> CreateMenuModel( const NotifierId& notifier_id, - const base::string16& display_source) OVERRIDE; - virtual bool HasClickedListener(const std::string& notification_id) OVERRIDE; + const base::string16& display_source) override; + virtual bool HasClickedListener(const std::string& notification_id) override; virtual void ClickOnNotificationButton(const std::string& notification_id, - int button_index) OVERRIDE; + int button_index) override; // Overridden from gfx::AnimationDelegate: - virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE; - virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE; - virtual void AnimationCanceled(const gfx::Animation* animation) OVERRIDE; + virtual void AnimationProgressed(const gfx::Animation* animation) override; + virtual void AnimationEnded(const gfx::Animation* animation) override; + virtual void AnimationCanceled(const gfx::Animation* animation) override; // Overridden from views::WidgetDelegate: - virtual views::View* GetContentsView() OVERRIDE; - virtual void WindowClosing() OVERRIDE; - virtual void OnDisplayChanged() OVERRIDE; - virtual void OnWorkAreaChanged() OVERRIDE; + virtual views::View* GetContentsView() override; + virtual void WindowClosing() override; + virtual void OnDisplayChanged() override; + virtual void OnWorkAreaChanged() override; // Initialization and update. void CreateWidget(gfx::NativeView parent); diff --git a/ui/native_theme/fallback_theme.h b/ui/native_theme/fallback_theme.h index 65eb3bd..4f695b0 100644 --- a/ui/native_theme/fallback_theme.h +++ b/ui/native_theme/fallback_theme.h @@ -18,7 +18,7 @@ class NATIVE_THEME_EXPORT FallbackTheme : public NativeThemeBase { protected: // Overridden from NativeThemeBase: - virtual SkColor GetSystemColor(ColorId color_id) const OVERRIDE; + virtual SkColor GetSystemColor(ColorId color_id) const override; private: DISALLOW_COPY_AND_ASSIGN(FallbackTheme); diff --git a/ui/native_theme/native_theme_android.h b/ui/native_theme/native_theme_android.h index e1d2f78..378a233 100644 --- a/ui/native_theme/native_theme_android.h +++ b/ui/native_theme/native_theme_android.h @@ -14,7 +14,7 @@ class NativeThemeAndroid : public NativeThemeBase { public: static NativeThemeAndroid* instance(); - virtual SkColor GetSystemColor(ColorId color_id) const OVERRIDE; + virtual SkColor GetSystemColor(ColorId color_id) const override; private: NativeThemeAndroid(); diff --git a/ui/native_theme/native_theme_aura.h b/ui/native_theme/native_theme_aura.h index 82a6ec9..2bcfbed 100644 --- a/ui/native_theme/native_theme_aura.h +++ b/ui/native_theme/native_theme_aura.h @@ -28,36 +28,36 @@ class NATIVE_THEME_EXPORT NativeThemeAura : public FallbackTheme { virtual void PaintMenuPopupBackground( SkCanvas* canvas, const gfx::Size& size, - const MenuBackgroundExtraParams& menu_background) const OVERRIDE; + const MenuBackgroundExtraParams& menu_background) const override; virtual void PaintMenuItemBackground( SkCanvas* canvas, State state, const gfx::Rect& rect, - const MenuListExtraParams& menu_list) const OVERRIDE; + const MenuListExtraParams& menu_list) const override; virtual void PaintArrowButton(SkCanvas* gc, const gfx::Rect& rect, Part direction, - State state) const OVERRIDE; + State state) const override; virtual void PaintScrollbarTrack( SkCanvas* sk_canvas, Part part, State state, const ScrollbarTrackExtraParams& extra_params, - const gfx::Rect& rect) const OVERRIDE; + const gfx::Rect& rect) const override; virtual void PaintScrollbarThumb(SkCanvas* sk_canvas, Part part, State state, - const gfx::Rect& rect) const OVERRIDE; + const gfx::Rect& rect) const override; virtual void PaintScrollbarCorner(SkCanvas* canvas, State state, - const gfx::Rect& rect) const OVERRIDE; + const gfx::Rect& rect) const override; virtual void PaintScrollbarThumbStateTransition(SkCanvas* canvas, State startState, State endState, double progress, const gfx::Rect& rect) const - OVERRIDE; + override; // Returns the NineImagePainter used to paint the specified state, creating if // necessary. If no image is provided for the specified state the normal state diff --git a/ui/native_theme/native_theme_aurawin.h b/ui/native_theme/native_theme_aurawin.h index 0b3a29e..7c7e57d 100644 --- a/ui/native_theme/native_theme_aurawin.h +++ b/ui/native_theme/native_theme_aurawin.h @@ -23,12 +23,12 @@ class NATIVE_THEME_EXPORT NativeThemeAuraWin : public NativeThemeAura { // Overridden from NativeThemeBase: virtual gfx::Size GetPartSize(Part part, State state, - const ExtraParams& extra) const OVERRIDE; + const ExtraParams& extra) const override; virtual void Paint(SkCanvas* canvas, Part part, State state, const gfx::Rect& rect, - const ExtraParams& extra) const OVERRIDE; + const ExtraParams& extra) const override; DISALLOW_COPY_AND_ASSIGN(NativeThemeAuraWin); }; diff --git a/ui/native_theme/native_theme_base.h b/ui/native_theme/native_theme_base.h index 454c4b6..b928c81 100644 --- a/ui/native_theme/native_theme_base.h +++ b/ui/native_theme/native_theme_base.h @@ -26,19 +26,19 @@ class NATIVE_THEME_EXPORT NativeThemeBase : public NativeTheme { // NativeTheme implementation: virtual gfx::Size GetPartSize(Part part, State state, - const ExtraParams& extra) const OVERRIDE; + const ExtraParams& extra) const override; virtual void Paint(SkCanvas* canvas, Part part, State state, const gfx::Rect& rect, - const ExtraParams& extra) const OVERRIDE; + const ExtraParams& extra) const override; virtual void PaintStateTransition(SkCanvas* canvas, Part part, State startState, State endState, double progress, - const gfx::Rect& rect) const OVERRIDE; + const gfx::Rect& rect) const override; protected: NativeThemeBase(); diff --git a/ui/native_theme/native_theme_mac.h b/ui/native_theme/native_theme_mac.h index ecdd38e..433e16d 100644 --- a/ui/native_theme/native_theme_mac.h +++ b/ui/native_theme/native_theme_mac.h @@ -17,7 +17,7 @@ class NativeThemeMac : public FallbackTheme { static NativeThemeMac* instance(); // Overridden from NativeTheme: - virtual SkColor GetSystemColor(ColorId color_id) const OVERRIDE; + virtual SkColor GetSystemColor(ColorId color_id) const override; // Overridden from NativeThemeBase: virtual void PaintScrollbarTrack( @@ -25,23 +25,23 @@ class NativeThemeMac : public FallbackTheme { Part part, State state, const ScrollbarTrackExtraParams& extra_params, - const gfx::Rect& rect) const OVERRIDE; + const gfx::Rect& rect) const override; virtual void PaintScrollbarThumb(SkCanvas* sk_canvas, Part part, State state, - const gfx::Rect& rect) const OVERRIDE; + const gfx::Rect& rect) const override; virtual void PaintScrollbarCorner(SkCanvas* canvas, State state, - const gfx::Rect& rect) const OVERRIDE; + const gfx::Rect& rect) const override; virtual void PaintMenuPopupBackground( SkCanvas* canvas, const gfx::Size& size, - const MenuBackgroundExtraParams& menu_background) const OVERRIDE; + const MenuBackgroundExtraParams& menu_background) const override; virtual void PaintMenuItemBackground( SkCanvas* canvas, State state, const gfx::Rect& rect, - const MenuListExtraParams& menu_list) const OVERRIDE; + const MenuListExtraParams& menu_list) const override; private: NativeThemeMac(); diff --git a/ui/native_theme/native_theme_win.h b/ui/native_theme/native_theme_win.h index 408818f..9430298 100644 --- a/ui/native_theme/native_theme_win.h +++ b/ui/native_theme/native_theme_win.h @@ -106,20 +106,20 @@ class NATIVE_THEME_EXPORT NativeThemeWin : public NativeTheme, // NativeTheme implementation: virtual gfx::Size GetPartSize(Part part, State state, - const ExtraParams& extra) const OVERRIDE; + const ExtraParams& extra) const override; virtual void Paint(SkCanvas* canvas, Part part, State state, const gfx::Rect& rect, - const ExtraParams& extra) const OVERRIDE; - virtual SkColor GetSystemColor(ColorId color_id) const OVERRIDE; + const ExtraParams& extra) const override; + virtual SkColor GetSystemColor(ColorId color_id) const override; private: NativeThemeWin(); ~NativeThemeWin(); // gfx::SysColorChangeListener implementation: - virtual void OnSysColorChange() OVERRIDE; + virtual void OnSysColorChange() override; // Update the locally cached set of system colors. void UpdateSystemColors(); diff --git a/ui/ozone/common/display_snapshot_proxy.h b/ui/ozone/common/display_snapshot_proxy.h index c0d29c5..175af51 100644 --- a/ui/ozone/common/display_snapshot_proxy.h +++ b/ui/ozone/common/display_snapshot_proxy.h @@ -17,7 +17,7 @@ class DisplaySnapshotProxy : public DisplaySnapshot { virtual ~DisplaySnapshotProxy(); // DisplaySnapshot override: - virtual std::string ToString() const OVERRIDE; + virtual std::string ToString() const override; private: std::string string_representation_; diff --git a/ui/ozone/common/native_display_delegate_ozone.h b/ui/ozone/common/native_display_delegate_ozone.h index 5507f9a..e600ce5 100644 --- a/ui/ozone/common/native_display_delegate_ozone.h +++ b/ui/ozone/common/native_display_delegate_ozone.h @@ -16,31 +16,31 @@ class NativeDisplayDelegateOzone : public NativeDisplayDelegate { virtual ~NativeDisplayDelegateOzone(); // NativeDisplayDelegate overrides: - virtual void Initialize() OVERRIDE; - virtual void GrabServer() OVERRIDE; - virtual void UngrabServer() OVERRIDE; - virtual void SyncWithServer() OVERRIDE; - virtual void SetBackgroundColor(uint32_t color_argb) OVERRIDE; - virtual void ForceDPMSOn() OVERRIDE; - virtual std::vector<ui::DisplaySnapshot*> GetDisplays() OVERRIDE; + virtual void Initialize() override; + virtual void GrabServer() override; + virtual void UngrabServer() override; + virtual void SyncWithServer() override; + virtual void SetBackgroundColor(uint32_t color_argb) override; + virtual void ForceDPMSOn() override; + virtual std::vector<ui::DisplaySnapshot*> GetDisplays() override; virtual void AddMode(const ui::DisplaySnapshot& output, - const ui::DisplayMode* mode) OVERRIDE; + const ui::DisplayMode* mode) override; virtual bool Configure(const ui::DisplaySnapshot& output, const ui::DisplayMode* mode, - const gfx::Point& origin) OVERRIDE; - virtual void CreateFrameBuffer(const gfx::Size& size) OVERRIDE; + const gfx::Point& origin) override; + virtual void CreateFrameBuffer(const gfx::Size& size) override; virtual bool GetHDCPState(const ui::DisplaySnapshot& output, - ui::HDCPState* state) OVERRIDE; + ui::HDCPState* state) override; virtual bool SetHDCPState(const ui::DisplaySnapshot& output, - ui::HDCPState state) OVERRIDE; + ui::HDCPState state) override; virtual std::vector<ui::ColorCalibrationProfile> GetAvailableColorCalibrationProfiles( - const ui::DisplaySnapshot& output) OVERRIDE; + const ui::DisplaySnapshot& output) override; virtual bool SetColorCalibrationProfile( const ui::DisplaySnapshot& output, - ui::ColorCalibrationProfile new_profile) OVERRIDE; - virtual void AddObserver(NativeDisplayObserver* observer) OVERRIDE; - virtual void RemoveObserver(NativeDisplayObserver* observer) OVERRIDE; + ui::ColorCalibrationProfile new_profile) override; + virtual void AddObserver(NativeDisplayObserver* observer) override; + virtual void RemoveObserver(NativeDisplayObserver* observer) override; private: DISALLOW_COPY_AND_ASSIGN(NativeDisplayDelegateOzone); diff --git a/ui/ozone/demo/ozone_demo.cc b/ui/ozone/demo/ozone_demo.cc index 42a6267..717b451 100644 --- a/ui/ozone/demo/ozone_demo.cc +++ b/ui/ozone/demo/ozone_demo.cc @@ -66,22 +66,22 @@ class DemoWindow : public ui::PlatformWindowDelegate { } // PlatformWindowDelegate: - virtual void OnBoundsChanged(const gfx::Rect& new_bounds) OVERRIDE {} - virtual void OnDamageRect(const gfx::Rect& damaged_region) OVERRIDE {} - virtual void DispatchEvent(ui::Event* event) OVERRIDE {} - virtual void OnCloseRequest() OVERRIDE { + virtual void OnBoundsChanged(const gfx::Rect& new_bounds) override {} + virtual void OnDamageRect(const gfx::Rect& damaged_region) override {} + virtual void DispatchEvent(ui::Event* event) override {} + virtual void OnCloseRequest() override { Quit(); } - virtual void OnClosed() OVERRIDE {} + virtual void OnClosed() override {} virtual void OnWindowStateChanged( - ui::PlatformWindowState new_state) OVERRIDE {} - virtual void OnLostCapture() OVERRIDE {} + ui::PlatformWindowState new_state) override {} + virtual void OnLostCapture() override {} virtual void OnAcceleratedWidgetAvailable( - gfx::AcceleratedWidget widget) OVERRIDE { + gfx::AcceleratedWidget widget) override { DCHECK_NE(widget, gfx::kNullAcceleratedWidget); widget_ = widget; } - virtual void OnActivationChanged(bool active) OVERRIDE {} + virtual void OnActivationChanged(bool active) override {} private: bool InitializeGLSurface() { diff --git a/ui/ozone/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc b/ui/ozone/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc index 6953185..3a6f2fb 100644 --- a/ui/ozone/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc +++ b/ui/ozone/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc @@ -28,7 +28,7 @@ class GLImageOzoneNativePixmap : public gfx::GLImageEGL { int z_order, gfx::OverlayTransform transform, const gfx::Rect& bounds_rect, - const gfx::RectF& crop_rect) OVERRIDE { + const gfx::RectF& crop_rect) override { return SurfaceFactoryOzone::GetInstance()->ScheduleOverlayPlane( widget, z_order, transform, pixmap_, bounds_rect, crop_rect); } diff --git a/ui/ozone/platform/caca/caca_window.h b/ui/ozone/platform/caca/caca_window.h index 444f3d5..5310a93 100644 --- a/ui/ozone/platform/caca/caca_window.h +++ b/ui/ozone/platform/caca/caca_window.h @@ -47,23 +47,23 @@ class CacaWindow : public PlatformWindow, public PlatformEventDispatcher { caca_display_t* display() const { return display_.get(); } // PlatformWindow: - virtual gfx::Rect GetBounds() OVERRIDE; - virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; - virtual void Show() OVERRIDE; - virtual void Hide() OVERRIDE; - virtual void Close() OVERRIDE; - virtual void SetCapture() OVERRIDE; - virtual void ReleaseCapture() OVERRIDE; - virtual void ToggleFullscreen() OVERRIDE; - virtual void Maximize() OVERRIDE; - virtual void Minimize() OVERRIDE; - virtual void Restore() OVERRIDE; - virtual void SetCursor(PlatformCursor cursor) OVERRIDE; - virtual void MoveCursorTo(const gfx::Point& location) OVERRIDE; + virtual gfx::Rect GetBounds() override; + virtual void SetBounds(const gfx::Rect& bounds) override; + virtual void Show() override; + virtual void Hide() override; + virtual void Close() override; + virtual void SetCapture() override; + virtual void ReleaseCapture() override; + virtual void ToggleFullscreen() override; + virtual void Maximize() override; + virtual void Minimize() override; + virtual void Restore() override; + virtual void SetCursor(PlatformCursor cursor) override; + virtual void MoveCursorTo(const gfx::Point& location) override; // PlatformEventDispatcher: - virtual bool CanDispatchEvent(const PlatformEvent& event) OVERRIDE; - virtual uint32_t DispatchEvent(const PlatformEvent& event) OVERRIDE; + virtual bool CanDispatchEvent(const PlatformEvent& event) override; + virtual uint32_t DispatchEvent(const PlatformEvent& event) override; private: // Event polling. diff --git a/ui/ozone/platform/caca/caca_window_manager.cc b/ui/ozone/platform/caca/caca_window_manager.cc index 9dbbc6b..247ba28 100644 --- a/ui/ozone/platform/caca/caca_window_manager.cc +++ b/ui/ozone/platform/caca/caca_window_manager.cc @@ -26,10 +26,10 @@ class CacaSurface : public ui::SurfaceOzoneCanvas { bool Initialize(); // ui::SurfaceOzoneCanvas overrides: - virtual skia::RefPtr<SkCanvas> GetCanvas() OVERRIDE; - virtual void ResizeCanvas(const gfx::Size& viewport_size) OVERRIDE; - virtual void PresentCanvas(const gfx::Rect& damage) OVERRIDE; - virtual scoped_ptr<gfx::VSyncProvider> CreateVSyncProvider() OVERRIDE; + virtual skia::RefPtr<SkCanvas> GetCanvas() override; + virtual void ResizeCanvas(const gfx::Size& viewport_size) override; + virtual void PresentCanvas(const gfx::Rect& damage) override; + virtual scoped_ptr<gfx::VSyncProvider> CreateVSyncProvider() override; private: CacaWindow* window_; // Not owned. diff --git a/ui/ozone/platform/caca/caca_window_manager.h b/ui/ozone/platform/caca/caca_window_manager.h index e01cf55..de1d5ae1 100644 --- a/ui/ozone/platform/caca/caca_window_manager.h +++ b/ui/ozone/platform/caca/caca_window_manager.h @@ -31,9 +31,9 @@ class CacaWindowManager : public SurfaceFactoryOzone { // ui::SurfaceFactoryOzone overrides: virtual bool LoadEGLGLES2Bindings( AddGLLibraryCallback add_gl_library, - SetGLGetProcAddressProcCallback set_gl_get_proc_address) OVERRIDE; + SetGLGetProcAddressProcCallback set_gl_get_proc_address) override; virtual scoped_ptr<SurfaceOzoneCanvas> CreateCanvasForWidget( - gfx::AcceleratedWidget widget) OVERRIDE; + gfx::AcceleratedWidget widget) override; private: IDMap<CacaWindow> windows_; diff --git a/ui/ozone/platform/caca/ozone_platform_caca.cc b/ui/ozone/platform/caca/ozone_platform_caca.cc index d892a63..a34f014 100644 --- a/ui/ozone/platform/caca/ozone_platform_caca.cc +++ b/ui/ozone/platform/caca/ozone_platform_caca.cc @@ -21,21 +21,21 @@ class OzonePlatformCaca : public OzonePlatform { virtual ~OzonePlatformCaca() {} // OzonePlatform: - virtual ui::SurfaceFactoryOzone* GetSurfaceFactoryOzone() OVERRIDE { + virtual ui::SurfaceFactoryOzone* GetSurfaceFactoryOzone() override { return window_manager_.get(); } - virtual CursorFactoryOzone* GetCursorFactoryOzone() OVERRIDE { + virtual CursorFactoryOzone* GetCursorFactoryOzone() override { return cursor_factory_ozone_.get(); } - virtual GpuPlatformSupport* GetGpuPlatformSupport() OVERRIDE { + virtual GpuPlatformSupport* GetGpuPlatformSupport() override { return NULL; // no GPU support } - virtual GpuPlatformSupportHost* GetGpuPlatformSupportHost() OVERRIDE { + virtual GpuPlatformSupportHost* GetGpuPlatformSupportHost() override { return NULL; // no GPU support } virtual scoped_ptr<PlatformWindow> CreatePlatformWindow( PlatformWindowDelegate* delegate, - const gfx::Rect& bounds) OVERRIDE { + const gfx::Rect& bounds) override { scoped_ptr<CacaWindow> caca_window(new CacaWindow( delegate, window_manager_.get(), event_source_.get(), bounds)); if (!caca_window->Initialize()) @@ -43,17 +43,17 @@ class OzonePlatformCaca : public OzonePlatform { return caca_window.PassAs<PlatformWindow>(); } virtual scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() - OVERRIDE { + override { return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateOzone()); } - virtual void InitializeUI() OVERRIDE { + virtual void InitializeUI() override { window_manager_.reset(new CacaWindowManager); event_source_.reset(new CacaEventSource()); cursor_factory_ozone_.reset(new CursorFactoryOzone()); } - virtual void InitializeGPU() OVERRIDE {} + virtual void InitializeGPU() override {} private: scoped_ptr<CacaWindowManager> window_manager_; diff --git a/ui/ozone/platform/dri/display_snapshot_dri.h b/ui/ozone/platform/dri/display_snapshot_dri.h index a509be4..5c13188 100644 --- a/ui/ozone/platform/dri/display_snapshot_dri.h +++ b/ui/ozone/platform/dri/display_snapshot_dri.h @@ -27,7 +27,7 @@ class DisplaySnapshotDri : public DisplaySnapshot { drmModePropertyRes* dpms_property() const { return dpms_property_.get(); } // DisplaySnapshot overrides: - virtual std::string ToString() const OVERRIDE; + virtual std::string ToString() const override; private: uint32_t connector_; diff --git a/ui/ozone/platform/dri/dri_buffer.h b/ui/ozone/platform/dri/dri_buffer.h index 9b645ae..773860f 100644 --- a/ui/ozone/platform/dri/dri_buffer.h +++ b/ui/ozone/platform/dri/dri_buffer.h @@ -28,9 +28,9 @@ class DriBuffer : public ScanoutBuffer { SkCanvas* GetCanvas() const; // ScanoutBuffer: - virtual uint32_t GetFramebufferId() const OVERRIDE; - virtual uint32_t GetHandle() const OVERRIDE; - virtual gfx::Size GetSize() const OVERRIDE; + virtual uint32_t GetFramebufferId() const override; + virtual uint32_t GetHandle() const override; + virtual gfx::Size GetSize() const override; protected: virtual ~DriBuffer(); @@ -59,7 +59,7 @@ class DriBufferGenerator : public ScanoutBufferGenerator { virtual ~DriBufferGenerator(); // ScanoutBufferGenerator: - virtual scoped_refptr<ScanoutBuffer> Create(const gfx::Size& size) OVERRIDE; + virtual scoped_refptr<ScanoutBuffer> Create(const gfx::Size& size) override; private: DriWrapper* dri_; // Not owned. diff --git a/ui/ozone/platform/dri/dri_cursor.h b/ui/ozone/platform/dri/dri_cursor.h index 949584c..f13abef 100644 --- a/ui/ozone/platform/dri/dri_cursor.h +++ b/ui/ozone/platform/dri/dri_cursor.h @@ -35,10 +35,10 @@ class DriCursor : public CursorDelegateEvdev { // CursorDelegateEvdev: virtual void MoveCursorTo(gfx::AcceleratedWidget widget, - const gfx::PointF& location) OVERRIDE; - virtual void MoveCursor(const gfx::Vector2dF& delta) OVERRIDE; - virtual bool IsCursorVisible() OVERRIDE; - virtual gfx::PointF location() OVERRIDE; + const gfx::PointF& location) override; + virtual void MoveCursor(const gfx::Vector2dF& delta) override; + virtual bool IsCursorVisible() override; + virtual gfx::PointF location() override; private: // The location of the bitmap (the cursor location is the hotspot location). diff --git a/ui/ozone/platform/dri/dri_gpu_platform_support.h b/ui/ozone/platform/dri/dri_gpu_platform_support.h index 65a8ee5..259edb7 100644 --- a/ui/ozone/platform/dri/dri_gpu_platform_support.h +++ b/ui/ozone/platform/dri/dri_gpu_platform_support.h @@ -40,10 +40,10 @@ class DriGpuPlatformSupport : public GpuPlatformSupport { void AddHandler(scoped_ptr<GpuPlatformSupport> handler); // GpuPlatformSupport: - virtual void OnChannelEstablished(IPC::Sender* sender) OVERRIDE; + virtual void OnChannelEstablished(IPC::Sender* sender) override; // IPC::Listener: - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; private: void OnCreateWindowDelegate(gfx::AcceleratedWidget widget); diff --git a/ui/ozone/platform/dri/dri_gpu_platform_support_host.h b/ui/ozone/platform/dri/dri_gpu_platform_support_host.h index 0315b54..61d35f0 100644 --- a/ui/ozone/platform/dri/dri_gpu_platform_support_host.h +++ b/ui/ozone/platform/dri/dri_gpu_platform_support_host.h @@ -39,22 +39,22 @@ class DriGpuPlatformSupportHost : public GpuPlatformSupportHost, void RemoveChannelObserver(ChannelObserver* observer); // GpuPlatformSupportHost: - virtual void OnChannelEstablished(int host_id, IPC::Sender* sender) OVERRIDE; - virtual void OnChannelDestroyed(int host_id) OVERRIDE; + virtual void OnChannelEstablished(int host_id, IPC::Sender* sender) override; + virtual void OnChannelDestroyed(int host_id) override; // IPC::Listener: - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; // IPC::Sender: - virtual bool Send(IPC::Message* message) OVERRIDE; + virtual bool Send(IPC::Message* message) override; // HardwareCursorDelegate: virtual void SetHardwareCursor(gfx::AcceleratedWidget widget, const std::vector<SkBitmap>& bitmaps, const gfx::Point& location, - int frame_delay_ms) OVERRIDE; + int frame_delay_ms) override; virtual void MoveHardwareCursor(gfx::AcceleratedWidget widget, - const gfx::Point& location) OVERRIDE; + const gfx::Point& location) override; private: int host_id_; diff --git a/ui/ozone/platform/dri/dri_surface.h b/ui/ozone/platform/dri/dri_surface.h index 740a310..d3b7807 100644 --- a/ui/ozone/platform/dri/dri_surface.h +++ b/ui/ozone/platform/dri/dri_surface.h @@ -27,10 +27,10 @@ class DriSurface : public SurfaceOzoneCanvas { virtual ~DriSurface(); // SurfaceOzoneCanvas: - virtual skia::RefPtr<SkCanvas> GetCanvas() OVERRIDE; - virtual void ResizeCanvas(const gfx::Size& viewport_size) OVERRIDE; - virtual void PresentCanvas(const gfx::Rect& damage) OVERRIDE; - virtual scoped_ptr<gfx::VSyncProvider> CreateVSyncProvider() OVERRIDE; + virtual skia::RefPtr<SkCanvas> GetCanvas() override; + virtual void ResizeCanvas(const gfx::Size& viewport_size) override; + virtual void PresentCanvas(const gfx::Rect& damage) override; + virtual scoped_ptr<gfx::VSyncProvider> CreateVSyncProvider() override; private: void UpdateNativeSurface(const gfx::Rect& damage); diff --git a/ui/ozone/platform/dri/dri_surface_factory.h b/ui/ozone/platform/dri/dri_surface_factory.h index c51847e..d05ad5f 100644 --- a/ui/ozone/platform/dri/dri_surface_factory.h +++ b/ui/ozone/platform/dri/dri_surface_factory.h @@ -50,18 +50,18 @@ class DriSurfaceFactory : public SurfaceFactoryOzone, // SurfaceFactoryOzone: virtual scoped_ptr<SurfaceOzoneCanvas> CreateCanvasForWidget( - gfx::AcceleratedWidget widget) OVERRIDE; + gfx::AcceleratedWidget widget) override; virtual bool LoadEGLGLES2Bindings( AddGLLibraryCallback add_gl_library, - SetGLGetProcAddressProcCallback set_gl_get_proc_address) OVERRIDE; + SetGLGetProcAddressProcCallback set_gl_get_proc_address) override; // HardwareCursorDelegate: virtual void SetHardwareCursor(gfx::AcceleratedWidget widget, const std::vector<SkBitmap>& bitmaps, const gfx::Point& location, - int frame_delay_ms) OVERRIDE; + int frame_delay_ms) override; virtual void MoveHardwareCursor(gfx::AcceleratedWidget window, - const gfx::Point& location) OVERRIDE; + const gfx::Point& location) override; protected: // Draw the last set cursor & update the cursor plane. diff --git a/ui/ozone/platform/dri/dri_surface_factory_unittest.cc b/ui/ozone/platform/dri/dri_surface_factory_unittest.cc index 1fbaf31..6a124c6 100644 --- a/ui/ozone/platform/dri/dri_surface_factory_unittest.cc +++ b/ui/ozone/platform/dri/dri_surface_factory_unittest.cc @@ -40,7 +40,7 @@ class MockScreenManager : public ui::ScreenManager { // Normally we'd use DRM to figure out the controller configuration. But we // can't use DRM in unit tests, so we just create a fake configuration. - virtual void ForceInitializationOfPrimaryDisplay() OVERRIDE { + virtual void ForceInitializationOfPrimaryDisplay() override { ConfigureDisplayController( kDefaultCrtc, kDefaultConnector, gfx::Point(), kDefaultMode); } @@ -57,8 +57,8 @@ class DriSurfaceFactoryTest : public testing::Test { public: DriSurfaceFactoryTest() {} - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; protected: scoped_ptr<base::MessageLoop> message_loop_; scoped_ptr<ui::MockDriWrapper> dri_; diff --git a/ui/ozone/platform/dri/dri_surface_unittest.cc b/ui/ozone/platform/dri/dri_surface_unittest.cc index 427911e..108e600 100644 --- a/ui/ozone/platform/dri/dri_surface_unittest.cc +++ b/ui/ozone/platform/dri/dri_surface_unittest.cc @@ -37,13 +37,13 @@ class MockDriWindowDelegate : public ui::DriWindowDelegate { virtual ~MockDriWindowDelegate() {} // DriWindowDelegate: - virtual void Initialize() OVERRIDE {} - virtual void Shutdown() OVERRIDE {} - virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE { return 1; } - virtual ui::HardwareDisplayController* GetController() OVERRIDE { + virtual void Initialize() override {} + virtual void Shutdown() override {} + virtual gfx::AcceleratedWidget GetAcceleratedWidget() override { return 1; } + virtual ui::HardwareDisplayController* GetController() override { return controller_.get(); } - virtual void OnBoundsChanged(const gfx::Rect& bounds) OVERRIDE {} + virtual void OnBoundsChanged(const gfx::Rect& bounds) override {} private: scoped_ptr<ui::HardwareDisplayController> controller_; @@ -57,8 +57,8 @@ class DriSurfaceTest : public testing::Test { public: DriSurfaceTest() {} - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; protected: scoped_ptr<base::MessageLoop> message_loop_; diff --git a/ui/ozone/platform/dri/dri_vsync_provider.h b/ui/ozone/platform/dri/dri_vsync_provider.h index c90aa80..05668f2 100644 --- a/ui/ozone/platform/dri/dri_vsync_provider.h +++ b/ui/ozone/platform/dri/dri_vsync_provider.h @@ -16,7 +16,7 @@ class DriVSyncProvider : public gfx::VSyncProvider { DriVSyncProvider(DriWindowDelegate* window_delegate); virtual ~DriVSyncProvider(); - virtual void GetVSyncParameters(const UpdateVSyncCallback& callback) OVERRIDE; + virtual void GetVSyncParameters(const UpdateVSyncCallback& callback) override; private: DriWindowDelegate* window_delegate_; // Not owned. diff --git a/ui/ozone/platform/dri/dri_window.h b/ui/ozone/platform/dri/dri_window.h index 825c6a0..4e1ed26 100644 --- a/ui/ozone/platform/dri/dri_window.h +++ b/ui/ozone/platform/dri/dri_window.h @@ -33,23 +33,23 @@ class DriWindow : public PlatformWindow, void Initialize(); // PlatformWindow: - virtual void Show() OVERRIDE; - virtual void Hide() OVERRIDE; - virtual void Close() OVERRIDE; - virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; - virtual gfx::Rect GetBounds() OVERRIDE; - virtual void SetCapture() OVERRIDE; - virtual void ReleaseCapture() OVERRIDE; - virtual void ToggleFullscreen() OVERRIDE; - virtual void Maximize() OVERRIDE; - virtual void Minimize() OVERRIDE; - virtual void Restore() OVERRIDE; - virtual void SetCursor(PlatformCursor cursor) OVERRIDE; - virtual void MoveCursorTo(const gfx::Point& location) OVERRIDE; + virtual void Show() override; + virtual void Hide() override; + virtual void Close() override; + virtual void SetBounds(const gfx::Rect& bounds) override; + virtual gfx::Rect GetBounds() override; + virtual void SetCapture() override; + virtual void ReleaseCapture() override; + virtual void ToggleFullscreen() override; + virtual void Maximize() override; + virtual void Minimize() override; + virtual void Restore() override; + virtual void SetCursor(PlatformCursor cursor) override; + virtual void MoveCursorTo(const gfx::Point& location) override; // PlatformEventDispatcher: - virtual bool CanDispatchEvent(const PlatformEvent& event) OVERRIDE; - virtual uint32_t DispatchEvent(const PlatformEvent& event) OVERRIDE; + virtual bool CanDispatchEvent(const PlatformEvent& event) override; + virtual uint32_t DispatchEvent(const PlatformEvent& event) override; // ChannelObserver: virtual void OnChannelEstablished() OVERRIDE; diff --git a/ui/ozone/platform/dri/dri_window_delegate_impl.h b/ui/ozone/platform/dri/dri_window_delegate_impl.h index 336b05d..0345beb 100644 --- a/ui/ozone/platform/dri/dri_window_delegate_impl.h +++ b/ui/ozone/platform/dri/dri_window_delegate_impl.h @@ -25,11 +25,11 @@ class DriWindowDelegateImpl : public DriWindowDelegate { virtual ~DriWindowDelegateImpl(); // DriWindowDelegate: - virtual void Initialize() OVERRIDE; - virtual void Shutdown() OVERRIDE; - virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE; - virtual HardwareDisplayController* GetController() OVERRIDE; - virtual void OnBoundsChanged(const gfx::Rect& bounds) OVERRIDE; + virtual void Initialize() override; + virtual void Shutdown() override; + virtual gfx::AcceleratedWidget GetAcceleratedWidget() override; + virtual HardwareDisplayController* GetController() override; + virtual void OnBoundsChanged(const gfx::Rect& bounds) override; private: gfx::AcceleratedWidget widget_; diff --git a/ui/ozone/platform/dri/gbm_buffer.h b/ui/ozone/platform/dri/gbm_buffer.h index b455db3..3451510 100644 --- a/ui/ozone/platform/dri/gbm_buffer.h +++ b/ui/ozone/platform/dri/gbm_buffer.h @@ -40,8 +40,8 @@ class GbmPixmap : public NativePixmap { GbmPixmap(scoped_refptr<GbmBuffer> buffer); // NativePixmap: - virtual void* GetEGLClientBuffer() OVERRIDE; - virtual int GetDmaBufFd() OVERRIDE; + virtual void* GetEGLClientBuffer() override; + virtual int GetDmaBufFd() override; scoped_refptr<GbmBuffer> buffer() { return buffer_; } diff --git a/ui/ozone/platform/dri/gbm_buffer_base.h b/ui/ozone/platform/dri/gbm_buffer_base.h index b536694..58ce159 100644 --- a/ui/ozone/platform/dri/gbm_buffer_base.h +++ b/ui/ozone/platform/dri/gbm_buffer_base.h @@ -22,9 +22,9 @@ class GbmBufferBase : public ScanoutBuffer { gbm_bo* bo() const { return bo_; } // ScanoutBuffer: - virtual uint32_t GetFramebufferId() const OVERRIDE; - virtual uint32_t GetHandle() const OVERRIDE; - virtual gfx::Size GetSize() const OVERRIDE; + virtual uint32_t GetFramebufferId() const override; + virtual uint32_t GetHandle() const override; + virtual gfx::Size GetSize() const override; protected: GbmBufferBase(DriWrapper* dri, gbm_bo* bo, bool scanout); diff --git a/ui/ozone/platform/dri/gbm_surface.h b/ui/ozone/platform/dri/gbm_surface.h index be52c9c..ed54b31 100644 --- a/ui/ozone/platform/dri/gbm_surface.h +++ b/ui/ozone/platform/dri/gbm_surface.h @@ -34,9 +34,9 @@ class GbmSurface : public GbmSurfaceless { bool Initialize(); // GbmSurfaceless: - virtual intptr_t GetNativeWindow() OVERRIDE; - virtual bool ResizeNativeWindow(const gfx::Size& viewport_size) OVERRIDE; - virtual bool OnSwapBuffers() OVERRIDE; + virtual intptr_t GetNativeWindow() override; + virtual bool ResizeNativeWindow(const gfx::Size& viewport_size) override; + virtual bool OnSwapBuffers() override; private: gbm_device* gbm_device_; diff --git a/ui/ozone/platform/dri/gbm_surface_factory.cc b/ui/ozone/platform/dri/gbm_surface_factory.cc index a31fceec..59f6a4c 100644 --- a/ui/ozone/platform/dri/gbm_surface_factory.cc +++ b/ui/ozone/platform/dri/gbm_surface_factory.cc @@ -29,7 +29,7 @@ class SingleOverlay : public OverlayCandidatesOzone { virtual ~SingleOverlay() {} virtual void CheckOverlaySupport( - OverlaySurfaceCandidateList* candidates) OVERRIDE { + OverlaySurfaceCandidateList* candidates) override { if (candidates->size() == 2) { OverlayCandidatesOzone::OverlaySurfaceCandidate* first = &(*candidates)[0]; diff --git a/ui/ozone/platform/dri/gbm_surface_factory.h b/ui/ozone/platform/dri/gbm_surface_factory.h index 2118db2..786f77d0 100644 --- a/ui/ozone/platform/dri/gbm_surface_factory.h +++ b/ui/ozone/platform/dri/gbm_surface_factory.h @@ -25,28 +25,28 @@ class GbmSurfaceFactory : public DriSurfaceFactory { DriWindowDelegateManager* window_manager); // DriSurfaceFactory: - virtual intptr_t GetNativeDisplay() OVERRIDE; + virtual intptr_t GetNativeDisplay() override; virtual const int32_t* GetEGLSurfaceProperties( - const int32_t* desired_list) OVERRIDE; + const int32_t* desired_list) override; virtual bool LoadEGLGLES2Bindings( AddGLLibraryCallback add_gl_library, - SetGLGetProcAddressProcCallback set_gl_get_proc_address) OVERRIDE; + SetGLGetProcAddressProcCallback set_gl_get_proc_address) override; virtual scoped_ptr<ui::SurfaceOzoneEGL> CreateEGLSurfaceForWidget( - gfx::AcceleratedWidget w) OVERRIDE; + gfx::AcceleratedWidget w) override; virtual scoped_ptr<SurfaceOzoneEGL> CreateSurfacelessEGLSurfaceForWidget( - gfx::AcceleratedWidget widget) OVERRIDE; + gfx::AcceleratedWidget widget) override; virtual scoped_refptr<ui::NativePixmap> CreateNativePixmap( gfx::Size size, - BufferFormat format) OVERRIDE; + BufferFormat format) override; virtual OverlayCandidatesOzone* GetOverlayCandidates( - gfx::AcceleratedWidget w) OVERRIDE; + gfx::AcceleratedWidget w) override; virtual bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget, int plane_z_order, gfx::OverlayTransform plane_transform, scoped_refptr<NativePixmap> buffer, const gfx::Rect& display_bounds, - const gfx::RectF& crop_rect) OVERRIDE; - virtual bool CanShowPrimaryPlaneAsOverlay() OVERRIDE; + const gfx::RectF& crop_rect) override; + virtual bool CanShowPrimaryPlaneAsOverlay() override; private: DriWindowDelegate* GetOrCreateWindowDelegate(gfx::AcceleratedWidget widget); diff --git a/ui/ozone/platform/dri/gbm_surfaceless.h b/ui/ozone/platform/dri/gbm_surfaceless.h index 4e3b92b..d30b7a4 100644 --- a/ui/ozone/platform/dri/gbm_surfaceless.h +++ b/ui/ozone/platform/dri/gbm_surfaceless.h @@ -25,10 +25,10 @@ class GbmSurfaceless : public SurfaceOzoneEGL { virtual ~GbmSurfaceless(); // SurfaceOzoneEGL: - virtual intptr_t GetNativeWindow() OVERRIDE; - virtual bool ResizeNativeWindow(const gfx::Size& viewport_size) OVERRIDE; - virtual bool OnSwapBuffers() OVERRIDE; - virtual scoped_ptr<gfx::VSyncProvider> CreateVSyncProvider() OVERRIDE; + virtual intptr_t GetNativeWindow() override; + virtual bool ResizeNativeWindow(const gfx::Size& viewport_size) override; + virtual bool OnSwapBuffers() override; + virtual scoped_ptr<gfx::VSyncProvider> CreateVSyncProvider() override; protected: DriWindowDelegate* window_delegate_; diff --git a/ui/ozone/platform/dri/hardware_display_controller_unittest.cc b/ui/ozone/platform/dri/hardware_display_controller_unittest.cc index bde4d5a..088e7b4 100644 --- a/ui/ozone/platform/dri/hardware_display_controller_unittest.cc +++ b/ui/ozone/platform/dri/hardware_display_controller_unittest.cc @@ -30,9 +30,9 @@ class MockScanoutBuffer : public ui::ScanoutBuffer { MockScanoutBuffer(const gfx::Size& size) : size_(size) {} // ScanoutBuffer: - virtual uint32_t GetFramebufferId() const OVERRIDE {return 0; } - virtual uint32_t GetHandle() const OVERRIDE { return 0; } - virtual gfx::Size GetSize() const OVERRIDE { return size_; } + virtual uint32_t GetFramebufferId() const override {return 0; } + virtual uint32_t GetHandle() const override { return 0; } + virtual gfx::Size GetSize() const override { return size_; } private: virtual ~MockScanoutBuffer() {} @@ -49,8 +49,8 @@ class HardwareDisplayControllerTest : public testing::Test { HardwareDisplayControllerTest() {} virtual ~HardwareDisplayControllerTest() {} - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; protected: scoped_ptr<ui::HardwareDisplayController> controller_; scoped_ptr<ui::MockDriWrapper> drm_; diff --git a/ui/ozone/platform/dri/native_display_delegate_dri.h b/ui/ozone/platform/dri/native_display_delegate_dri.h index 70abb7b9..fc20054 100644 --- a/ui/ozone/platform/dri/native_display_delegate_dri.h +++ b/ui/ozone/platform/dri/native_display_delegate_dri.h @@ -33,34 +33,34 @@ class NativeDisplayDelegateDri : public NativeDisplayDelegate, float refresh_rate); // NativeDisplayDelegate overrides: - virtual void Initialize() OVERRIDE; - virtual void GrabServer() OVERRIDE; - virtual void UngrabServer() OVERRIDE; - virtual void SyncWithServer() OVERRIDE; - virtual void SetBackgroundColor(uint32_t color_argb) OVERRIDE; - virtual void ForceDPMSOn() OVERRIDE; - virtual std::vector<DisplaySnapshot*> GetDisplays() OVERRIDE; + virtual void Initialize() override; + virtual void GrabServer() override; + virtual void UngrabServer() override; + virtual void SyncWithServer() override; + virtual void SetBackgroundColor(uint32_t color_argb) override; + virtual void ForceDPMSOn() override; + virtual std::vector<DisplaySnapshot*> GetDisplays() override; virtual void AddMode(const DisplaySnapshot& output, - const DisplayMode* mode) OVERRIDE; + const DisplayMode* mode) override; virtual bool Configure(const DisplaySnapshot& output, const DisplayMode* mode, - const gfx::Point& origin) OVERRIDE; - virtual void CreateFrameBuffer(const gfx::Size& size) OVERRIDE; + const gfx::Point& origin) override; + virtual void CreateFrameBuffer(const gfx::Size& size) override; virtual bool GetHDCPState(const DisplaySnapshot& output, - HDCPState* state) OVERRIDE; + HDCPState* state) override; virtual bool SetHDCPState(const DisplaySnapshot& output, - HDCPState state) OVERRIDE; + HDCPState state) override; virtual std::vector<ui::ColorCalibrationProfile> GetAvailableColorCalibrationProfiles( - const ui::DisplaySnapshot& output) OVERRIDE; + const ui::DisplaySnapshot& output) override; virtual bool SetColorCalibrationProfile( const ui::DisplaySnapshot& output, - ui::ColorCalibrationProfile new_profile) OVERRIDE; - virtual void AddObserver(NativeDisplayObserver* observer) OVERRIDE; - virtual void RemoveObserver(NativeDisplayObserver* observer) OVERRIDE; + ui::ColorCalibrationProfile new_profile) override; + virtual void AddObserver(NativeDisplayObserver* observer) override; + virtual void RemoveObserver(NativeDisplayObserver* observer) override; // DeviceEventObserver overrides: - virtual void OnDeviceEvent(const DeviceEvent& event) OVERRIDE; + virtual void OnDeviceEvent(const DeviceEvent& event) override; private: // Notify ScreenManager of all the displays that were present before the diff --git a/ui/ozone/platform/dri/native_display_delegate_proxy.h b/ui/ozone/platform/dri/native_display_delegate_proxy.h index 098c514..2dcf0e1 100644 --- a/ui/ozone/platform/dri/native_display_delegate_proxy.h +++ b/ui/ozone/platform/dri/native_display_delegate_proxy.h @@ -28,41 +28,41 @@ class NativeDisplayDelegateProxy : public NativeDisplayDelegate, virtual ~NativeDisplayDelegateProxy(); // NativeDisplayDelegate overrides: - virtual void Initialize() OVERRIDE; - virtual void GrabServer() OVERRIDE; - virtual void UngrabServer() OVERRIDE; - virtual void SyncWithServer() OVERRIDE; - virtual void SetBackgroundColor(uint32_t color_argb) OVERRIDE; - virtual void ForceDPMSOn() OVERRIDE; - virtual std::vector<DisplaySnapshot*> GetDisplays() OVERRIDE; + virtual void Initialize() override; + virtual void GrabServer() override; + virtual void UngrabServer() override; + virtual void SyncWithServer() override; + virtual void SetBackgroundColor(uint32_t color_argb) override; + virtual void ForceDPMSOn() override; + virtual std::vector<DisplaySnapshot*> GetDisplays() override; virtual void AddMode(const DisplaySnapshot& output, - const DisplayMode* mode) OVERRIDE; + const DisplayMode* mode) override; virtual bool Configure(const DisplaySnapshot& output, const DisplayMode* mode, - const gfx::Point& origin) OVERRIDE; - virtual void CreateFrameBuffer(const gfx::Size& size) OVERRIDE; + const gfx::Point& origin) override; + virtual void CreateFrameBuffer(const gfx::Size& size) override; virtual bool GetHDCPState(const DisplaySnapshot& output, - HDCPState* state) OVERRIDE; + HDCPState* state) override; virtual bool SetHDCPState(const DisplaySnapshot& output, - HDCPState state) OVERRIDE; + HDCPState state) override; virtual std::vector<ColorCalibrationProfile> GetAvailableColorCalibrationProfiles( - const DisplaySnapshot& output) OVERRIDE; + const DisplaySnapshot& output) override; virtual bool SetColorCalibrationProfile( const DisplaySnapshot& output, - ColorCalibrationProfile new_profile) OVERRIDE; - virtual void AddObserver(NativeDisplayObserver* observer) OVERRIDE; - virtual void RemoveObserver(NativeDisplayObserver* observer) OVERRIDE; + ColorCalibrationProfile new_profile) override; + virtual void AddObserver(NativeDisplayObserver* observer) override; + virtual void RemoveObserver(NativeDisplayObserver* observer) override; // DeviceEventObserver overrides: - virtual void OnDeviceEvent(const DeviceEvent& event) OVERRIDE; + virtual void OnDeviceEvent(const DeviceEvent& event) override; // GpuPlatformSupportHost: - virtual void OnChannelEstablished(int host_id, IPC::Sender* sender) OVERRIDE; - virtual void OnChannelDestroyed(int host_id) OVERRIDE; + virtual void OnChannelEstablished(int host_id, IPC::Sender* sender) override; + virtual void OnChannelDestroyed(int host_id) override; // IPC::Listener overrides: - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; private: void OnUpdateNativeDisplays( diff --git a/ui/ozone/platform/dri/ozone_platform_dri.cc b/ui/ozone/platform/dri/ozone_platform_dri.cc index f4f0914..88d6207 100644 --- a/ui/ozone/platform/dri/ozone_platform_dri.cc +++ b/ui/ozone/platform/dri/ozone_platform_dri.cc @@ -50,21 +50,21 @@ class OzonePlatformDri : public OzonePlatform { virtual ~OzonePlatformDri() {} // OzonePlatform: - virtual ui::SurfaceFactoryOzone* GetSurfaceFactoryOzone() OVERRIDE { + virtual ui::SurfaceFactoryOzone* GetSurfaceFactoryOzone() override { return surface_factory_ozone_.get(); } - virtual CursorFactoryOzone* GetCursorFactoryOzone() OVERRIDE { + virtual CursorFactoryOzone* GetCursorFactoryOzone() override { return cursor_factory_ozone_.get(); } - virtual GpuPlatformSupport* GetGpuPlatformSupport() OVERRIDE { + virtual GpuPlatformSupport* GetGpuPlatformSupport() override { return gpu_platform_support_.get(); } - virtual GpuPlatformSupportHost* GetGpuPlatformSupportHost() OVERRIDE { + virtual GpuPlatformSupportHost* GetGpuPlatformSupportHost() override { return gpu_platform_support_host_.get(); } virtual scoped_ptr<PlatformWindow> CreatePlatformWindow( PlatformWindowDelegate* delegate, - const gfx::Rect& bounds) OVERRIDE { + const gfx::Rect& bounds) override { scoped_ptr<DriWindow> platform_window( new DriWindow(delegate, bounds, @@ -75,11 +75,11 @@ class OzonePlatformDri : public OzonePlatform { return platform_window.PassAs<PlatformWindow>(); } virtual scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() - OVERRIDE { + override { return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateDri( dri_.get(), screen_manager_.get(), device_manager_.get())); } - virtual void InitializeUI() OVERRIDE { + virtual void InitializeUI() override { dri_->Initialize(); surface_factory_ozone_.reset(new DriSurfaceFactory( dri_.get(), screen_manager_.get(), &window_delegate_manager_)); @@ -101,7 +101,7 @@ class OzonePlatformDri : public OzonePlatform { LOG(FATAL) << "Failed to initialize dummy channel."; } - virtual void InitializeGPU() OVERRIDE {} + virtual void InitializeGPU() override {} private: scoped_ptr<VirtualTerminalManager> vt_manager_; diff --git a/ui/ozone/platform/dri/ozone_platform_gbm.cc b/ui/ozone/platform/dri/ozone_platform_gbm.cc index e8f0bef..737689c 100644 --- a/ui/ozone/platform/dri/ozone_platform_gbm.cc +++ b/ui/ozone/platform/dri/ozone_platform_gbm.cc @@ -57,7 +57,7 @@ class GbmBufferGenerator : public ScanoutBufferGenerator { gbm_device* device() const { return device_; } - virtual scoped_refptr<ScanoutBuffer> Create(const gfx::Size& size) OVERRIDE { + virtual scoped_refptr<ScanoutBuffer> Create(const gfx::Size& size) override { return GbmBuffer::CreateBuffer( dri_, device_, SurfaceFactoryOzone::RGBA_8888, size, true); } @@ -82,21 +82,21 @@ class OzonePlatformGbm : public OzonePlatform { virtual ~OzonePlatformGbm() {} // OzonePlatform: - virtual ui::SurfaceFactoryOzone* GetSurfaceFactoryOzone() OVERRIDE { + virtual ui::SurfaceFactoryOzone* GetSurfaceFactoryOzone() override { return surface_factory_ozone_.get(); } - virtual CursorFactoryOzone* GetCursorFactoryOzone() OVERRIDE { + virtual CursorFactoryOzone* GetCursorFactoryOzone() override { return cursor_factory_ozone_.get(); } - virtual GpuPlatformSupport* GetGpuPlatformSupport() OVERRIDE { + virtual GpuPlatformSupport* GetGpuPlatformSupport() override { return gpu_platform_support_.get(); } - virtual GpuPlatformSupportHost* GetGpuPlatformSupportHost() OVERRIDE { + virtual GpuPlatformSupportHost* GetGpuPlatformSupportHost() override { return gpu_platform_support_host_.get(); } virtual scoped_ptr<PlatformWindow> CreatePlatformWindow( PlatformWindowDelegate* delegate, - const gfx::Rect& bounds) OVERRIDE { + const gfx::Rect& bounds) override { scoped_ptr<DriWindow> platform_window( new DriWindow(delegate, bounds, @@ -107,11 +107,11 @@ class OzonePlatformGbm : public OzonePlatform { return platform_window.PassAs<PlatformWindow>(); } virtual scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() - OVERRIDE { + override { return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateProxy( gpu_platform_support_host_.get(), device_manager_.get())); } - virtual void InitializeUI() OVERRIDE { + virtual void InitializeUI() override { vt_manager_.reset(new VirtualTerminalManager()); // Needed since the browser process creates the accelerated widgets and that // happens through SFO. @@ -125,7 +125,7 @@ class OzonePlatformGbm : public OzonePlatform { device_manager_.get())); } - virtual void InitializeGPU() OVERRIDE { + virtual void InitializeGPU() override { dri_.reset(new DriWrapper(kDefaultGraphicsCardPath)); dri_->Initialize(); buffer_generator_.reset(new GbmBufferGenerator(dri_.get())); diff --git a/ui/ozone/platform/dri/screen_manager_unittest.cc b/ui/ozone/platform/dri/screen_manager_unittest.cc index 843553f..1ee0006 100644 --- a/ui/ozone/platform/dri/screen_manager_unittest.cc +++ b/ui/ozone/platform/dri/screen_manager_unittest.cc @@ -25,7 +25,7 @@ class MockScreenManager : public ui::ScreenManager { ui::ScanoutBufferGenerator* buffer_generator) : ScreenManager(dri, buffer_generator), dri_(dri) {} - virtual void ForceInitializationOfPrimaryDisplay() OVERRIDE {} + virtual void ForceInitializationOfPrimaryDisplay() override {} private: ui::DriWrapper* dri_; @@ -50,13 +50,13 @@ class ScreenManagerTest : public testing::Test { kDefaultMode.hdisplay, 0, kDefaultMode.hdisplay, kDefaultMode.vdisplay); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { dri_.reset(new ui::MockDriWrapper(3)); buffer_generator_.reset(new ui::DriBufferGenerator(dri_.get())); screen_manager_.reset(new MockScreenManager( dri_.get(), buffer_generator_.get())); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { screen_manager_.reset(); dri_.reset(); } diff --git a/ui/ozone/platform/dri/test/mock_dri_wrapper.h b/ui/ozone/platform/dri/test/mock_dri_wrapper.h index 3d4517b..e7ac6c7 100644 --- a/ui/ozone/platform/dri/test/mock_dri_wrapper.h +++ b/ui/ozone/platform/dri/test/mock_dri_wrapper.h @@ -50,50 +50,50 @@ class MockDriWrapper : public ui::DriWrapper { } // DriWrapper: - virtual ScopedDrmCrtcPtr GetCrtc(uint32_t crtc_id) OVERRIDE; + virtual ScopedDrmCrtcPtr GetCrtc(uint32_t crtc_id) override; virtual bool SetCrtc(uint32_t crtc_id, uint32_t framebuffer, std::vector<uint32_t> connectors, - drmModeModeInfo* mode) OVERRIDE; + drmModeModeInfo* mode) override; virtual bool SetCrtc(drmModeCrtc* crtc, - std::vector<uint32_t> connectors) OVERRIDE; - virtual ScopedDrmConnectorPtr GetConnector(uint32_t connector_id) OVERRIDE; + std::vector<uint32_t> connectors) override; + virtual ScopedDrmConnectorPtr GetConnector(uint32_t connector_id) override; virtual bool AddFramebuffer(uint32_t width, uint32_t height, uint8_t depth, uint8_t bpp, uint32_t stride, uint32_t handle, - uint32_t* framebuffer) OVERRIDE; - virtual bool RemoveFramebuffer(uint32_t framebuffer) OVERRIDE; + uint32_t* framebuffer) override; + virtual bool RemoveFramebuffer(uint32_t framebuffer) override; virtual bool PageFlip(uint32_t crtc_id, uint32_t framebuffer, - void* data) OVERRIDE; + void* data) override; virtual bool PageFlipOverlay(uint32_t crtc_id, uint32_t framebuffer, const gfx::Rect& location, const gfx::RectF& source, - int overlay_plane) OVERRIDE; + int overlay_plane) override; virtual ScopedDrmPropertyPtr GetProperty(drmModeConnector* connector, - const char* name) OVERRIDE; + const char* name) override; virtual bool SetProperty(uint32_t connector_id, uint32_t property_id, - uint64_t value) OVERRIDE; + uint64_t value) override; virtual ScopedDrmPropertyBlobPtr GetPropertyBlob(drmModeConnector* connector, - const char* name) OVERRIDE; + const char* name) override; virtual bool SetCursor(uint32_t crtc_id, uint32_t handle, - const gfx::Size& size) OVERRIDE; - virtual bool MoveCursor(uint32_t crtc_id, const gfx::Point& point) OVERRIDE; - virtual void HandleEvent(drmEventContext& event) OVERRIDE; + const gfx::Size& size) override; + virtual bool MoveCursor(uint32_t crtc_id, const gfx::Point& point) override; + virtual void HandleEvent(drmEventContext& event) override; virtual bool CreateDumbBuffer(const SkImageInfo& info, uint32_t* handle, uint32_t* stride, - void** pixels) OVERRIDE; + void** pixels) override; virtual void DestroyDumbBuffer(const SkImageInfo& info, uint32_t handle, uint32_t stride, - void* pixels) OVERRIDE; + void* pixels) override; private: int get_crtc_call_count_; diff --git a/ui/ozone/platform/egltest/ozone_platform_egltest.cc b/ui/ozone/platform/egltest/ozone_platform_egltest.cc index 46ee4ef..c192c9f 100644 --- a/ui/ozone/platform/egltest/ozone_platform_egltest.cc +++ b/ui/ozone/platform/egltest/ozone_platform_egltest.cc @@ -54,23 +54,23 @@ class EgltestWindow : public PlatformWindow, public PlatformEventDispatcher { virtual ~EgltestWindow(); // PlatformWindow: - virtual gfx::Rect GetBounds() OVERRIDE; - virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; - virtual void Show() OVERRIDE; - virtual void Hide() OVERRIDE; - virtual void Close() OVERRIDE; - virtual void SetCapture() OVERRIDE; - virtual void ReleaseCapture() OVERRIDE; - virtual void ToggleFullscreen() OVERRIDE; - virtual void Maximize() OVERRIDE; - virtual void Minimize() OVERRIDE; - virtual void Restore() OVERRIDE; - virtual void SetCursor(PlatformCursor cursor) OVERRIDE; - virtual void MoveCursorTo(const gfx::Point& location) OVERRIDE; + virtual gfx::Rect GetBounds() override; + virtual void SetBounds(const gfx::Rect& bounds) override; + virtual void Show() override; + virtual void Hide() override; + virtual void Close() override; + virtual void SetCapture() override; + virtual void ReleaseCapture() override; + virtual void ToggleFullscreen() override; + virtual void Maximize() override; + virtual void Minimize() override; + virtual void Restore() override; + virtual void SetCursor(PlatformCursor cursor) override; + virtual void MoveCursorTo(const gfx::Point& location) override; // PlatformEventDispatcher: - virtual bool CanDispatchEvent(const PlatformEvent& event) OVERRIDE; - virtual uint32_t DispatchEvent(const PlatformEvent& event) OVERRIDE; + virtual bool CanDispatchEvent(const PlatformEvent& event) override; + virtual uint32_t DispatchEvent(const PlatformEvent& event) override; private: PlatformWindowDelegate* delegate_; @@ -174,15 +174,15 @@ class SurfaceOzoneEgltest : public SurfaceOzoneEGL { DCHECK(ret); } - virtual intptr_t GetNativeWindow() OVERRIDE { return native_window_; } + virtual intptr_t GetNativeWindow() override { return native_window_; } - virtual bool OnSwapBuffers() OVERRIDE { return true; } + virtual bool OnSwapBuffers() override { return true; } - virtual bool ResizeNativeWindow(const gfx::Size& viewport_size) OVERRIDE { + virtual bool ResizeNativeWindow(const gfx::Size& viewport_size) override { return true; } - virtual scoped_ptr<gfx::VSyncProvider> CreateVSyncProvider() OVERRIDE { + virtual scoped_ptr<gfx::VSyncProvider> CreateVSyncProvider() override { return scoped_ptr<gfx::VSyncProvider>(); } @@ -203,14 +203,14 @@ class SurfaceFactoryEgltest : public ui::SurfaceFactoryOzone { virtual ~SurfaceFactoryEgltest() {} // SurfaceFactoryOzone: - virtual intptr_t GetNativeDisplay() OVERRIDE; + virtual intptr_t GetNativeDisplay() override; virtual scoped_ptr<SurfaceOzoneEGL> CreateEGLSurfaceForWidget( - gfx::AcceleratedWidget widget) OVERRIDE; + gfx::AcceleratedWidget widget) override; virtual const int32* GetEGLSurfaceProperties( - const int32* desired_list) OVERRIDE; + const int32* desired_list) override; virtual bool LoadEGLGLES2Bindings( AddGLLibraryCallback add_gl_library, - SetGLGetProcAddressProcCallback set_gl_get_proc_address) OVERRIDE; + SetGLGetProcAddressProcCallback set_gl_get_proc_address) override; private: LibeglplatformShimLoader* eglplatform_shim_; @@ -317,21 +317,21 @@ class OzonePlatformEgltest : public OzonePlatform { } // OzonePlatform: - virtual ui::SurfaceFactoryOzone* GetSurfaceFactoryOzone() OVERRIDE { + virtual ui::SurfaceFactoryOzone* GetSurfaceFactoryOzone() override { return surface_factory_ozone_.get(); } - virtual CursorFactoryOzone* GetCursorFactoryOzone() OVERRIDE { + virtual CursorFactoryOzone* GetCursorFactoryOzone() override { return cursor_factory_ozone_.get(); } - virtual GpuPlatformSupport* GetGpuPlatformSupport() OVERRIDE { + virtual GpuPlatformSupport* GetGpuPlatformSupport() override { return gpu_platform_support_.get(); } - virtual GpuPlatformSupportHost* GetGpuPlatformSupportHost() OVERRIDE { + virtual GpuPlatformSupportHost* GetGpuPlatformSupportHost() override { return gpu_platform_support_host_.get(); } virtual scoped_ptr<PlatformWindow> CreatePlatformWindow( PlatformWindowDelegate* delegate, - const gfx::Rect& bounds) OVERRIDE { + const gfx::Rect& bounds) override { return make_scoped_ptr<PlatformWindow>( new EgltestWindow(delegate, &eglplatform_shim_, @@ -339,11 +339,11 @@ class OzonePlatformEgltest : public OzonePlatform { bounds)); } virtual scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() - OVERRIDE { + override { return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateOzone()); } - virtual void InitializeUI() OVERRIDE { + virtual void InitializeUI() override { device_manager_ = CreateDeviceManager(); if (!surface_factory_ozone_) surface_factory_ozone_.reset( @@ -354,7 +354,7 @@ class OzonePlatformEgltest : public OzonePlatform { gpu_platform_support_host_.reset(CreateStubGpuPlatformSupportHost()); } - virtual void InitializeGPU() OVERRIDE { + virtual void InitializeGPU() override { if (!surface_factory_ozone_) surface_factory_ozone_.reset( new SurfaceFactoryEgltest(&eglplatform_shim_)); diff --git a/ui/ozone/platform/test/ozone_platform_test.cc b/ui/ozone/platform/test/ozone_platform_test.cc index 1057291..d657129 100644 --- a/ui/ozone/platform/test/ozone_platform_test.cc +++ b/ui/ozone/platform/test/ozone_platform_test.cc @@ -30,30 +30,30 @@ class OzonePlatformTest : public OzonePlatform { virtual ~OzonePlatformTest() {} // OzonePlatform: - virtual ui::SurfaceFactoryOzone* GetSurfaceFactoryOzone() OVERRIDE { + virtual ui::SurfaceFactoryOzone* GetSurfaceFactoryOzone() override { return window_manager_.get(); } - virtual CursorFactoryOzone* GetCursorFactoryOzone() OVERRIDE { + virtual CursorFactoryOzone* GetCursorFactoryOzone() override { return cursor_factory_ozone_.get(); } - virtual GpuPlatformSupport* GetGpuPlatformSupport() OVERRIDE { + virtual GpuPlatformSupport* GetGpuPlatformSupport() override { return gpu_platform_support_.get(); } - virtual GpuPlatformSupportHost* GetGpuPlatformSupportHost() OVERRIDE { + virtual GpuPlatformSupportHost* GetGpuPlatformSupportHost() override { return gpu_platform_support_host_.get(); } virtual scoped_ptr<PlatformWindow> CreatePlatformWindow( PlatformWindowDelegate* delegate, - const gfx::Rect& bounds) OVERRIDE { + const gfx::Rect& bounds) override { return make_scoped_ptr<PlatformWindow>( new TestWindow(delegate, window_manager_.get(), bounds)); } virtual scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() - OVERRIDE { + override { return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateOzone()); } - virtual void InitializeUI() OVERRIDE { + virtual void InitializeUI() override { window_manager_.reset(new TestWindowManager(file_path_)); window_manager_->Initialize(); // This unbreaks tests that create their own. @@ -64,7 +64,7 @@ class OzonePlatformTest : public OzonePlatform { gpu_platform_support_host_.reset(CreateStubGpuPlatformSupportHost()); } - virtual void InitializeGPU() OVERRIDE { + virtual void InitializeGPU() override { gpu_platform_support_.reset(CreateStubGpuPlatformSupport()); } diff --git a/ui/ozone/platform/test/test_window.h b/ui/ozone/platform/test/test_window.h index 13a23a6..37e4ec4 100644 --- a/ui/ozone/platform/test/test_window.h +++ b/ui/ozone/platform/test/test_window.h @@ -26,19 +26,19 @@ class TestWindow : public PlatformWindow { base::FilePath path(); // PlatformWindow: - virtual gfx::Rect GetBounds() OVERRIDE; - virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; - virtual void Show() OVERRIDE; - virtual void Hide() OVERRIDE; - virtual void Close() OVERRIDE; - virtual void SetCapture() OVERRIDE; - virtual void ReleaseCapture() OVERRIDE; - virtual void ToggleFullscreen() OVERRIDE; - virtual void Maximize() OVERRIDE; - virtual void Minimize() OVERRIDE; - virtual void Restore() OVERRIDE; - virtual void SetCursor(PlatformCursor cursor) OVERRIDE; - virtual void MoveCursorTo(const gfx::Point& location) OVERRIDE; + virtual gfx::Rect GetBounds() override; + virtual void SetBounds(const gfx::Rect& bounds) override; + virtual void Show() override; + virtual void Hide() override; + virtual void Close() override; + virtual void SetCapture() override; + virtual void ReleaseCapture() override; + virtual void ToggleFullscreen() override; + virtual void Maximize() override; + virtual void Minimize() override; + virtual void Restore() override; + virtual void SetCursor(PlatformCursor cursor) override; + virtual void MoveCursorTo(const gfx::Point& location) override; private: PlatformWindowDelegate* delegate_; diff --git a/ui/ozone/platform/test/test_window_manager.cc b/ui/ozone/platform/test/test_window_manager.cc index 6eb1aef..7ffbad8 100644 --- a/ui/ozone/platform/test/test_window_manager.cc +++ b/ui/ozone/platform/test/test_window_manager.cc @@ -35,14 +35,14 @@ class FileSurface : public SurfaceOzoneCanvas { virtual ~FileSurface() {} // SurfaceOzoneCanvas overrides: - virtual void ResizeCanvas(const gfx::Size& viewport_size) OVERRIDE { + virtual void ResizeCanvas(const gfx::Size& viewport_size) override { surface_ = skia::AdoptRef(SkSurface::NewRaster(SkImageInfo::MakeN32Premul( viewport_size.width(), viewport_size.height()))); } - virtual skia::RefPtr<SkCanvas> GetCanvas() OVERRIDE { + virtual skia::RefPtr<SkCanvas> GetCanvas() override { return skia::SharePtr(surface_->getCanvas()); } - virtual void PresentCanvas(const gfx::Rect& damage) OVERRIDE { + virtual void PresentCanvas(const gfx::Rect& damage) override { if (location_.empty()) return; SkBitmap bitmap; @@ -55,7 +55,7 @@ class FileSurface : public SurfaceOzoneCanvas { FROM_HERE, base::Bind(&WriteDataToFile, location_, bitmap), true); } } - virtual scoped_ptr<gfx::VSyncProvider> CreateVSyncProvider() OVERRIDE { + virtual scoped_ptr<gfx::VSyncProvider> CreateVSyncProvider() override { return scoped_ptr<gfx::VSyncProvider>(); } diff --git a/ui/ozone/platform/test/test_window_manager.h b/ui/ozone/platform/test/test_window_manager.h index 8efbb69..0241e8b 100644 --- a/ui/ozone/platform/test/test_window_manager.h +++ b/ui/ozone/platform/test/test_window_manager.h @@ -33,10 +33,10 @@ class TestWindowManager : public SurfaceFactoryOzone { // SurfaceFactoryOzone: virtual scoped_ptr<SurfaceOzoneCanvas> CreateCanvasForWidget( - gfx::AcceleratedWidget w) OVERRIDE; + gfx::AcceleratedWidget w) override; virtual bool LoadEGLGLES2Bindings( AddGLLibraryCallback add_gl_library, - SetGLGetProcAddressProcCallback set_gl_get_proc_address) OVERRIDE; + SetGLGetProcAddressProcCallback set_gl_get_proc_address) override; private: base::FilePath location_; diff --git a/ui/ozone/public/gpu_platform_support.cc b/ui/ozone/public/gpu_platform_support.cc index 2ac2004..f9f1589 100644 --- a/ui/ozone/public/gpu_platform_support.cc +++ b/ui/ozone/public/gpu_platform_support.cc @@ -15,8 +15,8 @@ namespace { class StubGpuPlatformSupport : public GpuPlatformSupport { public: // GpuPlatformSupport: - virtual void OnChannelEstablished(IPC::Sender* sender) OVERRIDE {} - virtual bool OnMessageReceived(const IPC::Message&) OVERRIDE { return false; } + virtual void OnChannelEstablished(IPC::Sender* sender) override {} + virtual bool OnMessageReceived(const IPC::Message&) override { return false; } }; } // namespace diff --git a/ui/ozone/public/gpu_platform_support_host.cc b/ui/ozone/public/gpu_platform_support_host.cc index 1a75efd..a611f50 100644 --- a/ui/ozone/public/gpu_platform_support_host.cc +++ b/ui/ozone/public/gpu_platform_support_host.cc @@ -16,10 +16,10 @@ namespace { class StubGpuPlatformSupportHost : public GpuPlatformSupportHost { public: // GpuPlatformSupportHost: - virtual void OnChannelEstablished(int host_id, IPC::Sender* sender) OVERRIDE { + virtual void OnChannelEstablished(int host_id, IPC::Sender* sender) override { } - virtual void OnChannelDestroyed(int host_id) OVERRIDE {} - virtual bool OnMessageReceived(const IPC::Message&) OVERRIDE { return false; } + virtual void OnChannelDestroyed(int host_id) override {} + virtual bool OnMessageReceived(const IPC::Message&) override { return false; } }; } // namespace diff --git a/ui/ozone/public/ui_thread_gpu.cc b/ui/ozone/public/ui_thread_gpu.cc index 68b260e..9601759 100644 --- a/ui/ozone/public/ui_thread_gpu.cc +++ b/ui/ozone/public/ui_thread_gpu.cc @@ -20,7 +20,7 @@ class UiThreadGpuForwardingSender : public IPC::Sender { virtual ~UiThreadGpuForwardingSender() {} // IPC::Sender: - virtual bool Send(IPC::Message* msg) OVERRIDE { + virtual bool Send(IPC::Message* msg) override { listener_->OnMessageReceived(*msg); delete msg; return true; diff --git a/ui/ozone/run_all_unittests.cc b/ui/ozone/run_all_unittests.cc index 3227099..6192740 100644 --- a/ui/ozone/run_all_unittests.cc +++ b/ui/ozone/run_all_unittests.cc @@ -15,8 +15,8 @@ class OzoneTestSuite : public base::TestSuite { protected: // base::TestSuite: - virtual void Initialize() OVERRIDE; - virtual void Shutdown() OVERRIDE; + virtual void Initialize() override; + virtual void Shutdown() override; private: DISALLOW_COPY_AND_ASSIGN(OzoneTestSuite); diff --git a/ui/platform_window/win/win_window.h b/ui/platform_window/win/win_window.h index 18fada5..65ffb5a 100644 --- a/ui/platform_window/win/win_window.h +++ b/ui/platform_window/win/win_window.h @@ -22,19 +22,19 @@ class WIN_WINDOW_EXPORT WinWindow : public NON_EXPORTED_BASE(PlatformWindow), void Destroy(); // PlatformWindow: - virtual void Show() OVERRIDE; - virtual void Hide() OVERRIDE; - virtual void Close() OVERRIDE; - virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; - virtual gfx::Rect GetBounds() OVERRIDE; - virtual void SetCapture() OVERRIDE; - virtual void ReleaseCapture() OVERRIDE; - virtual void ToggleFullscreen() OVERRIDE; - virtual void Maximize() OVERRIDE; - virtual void Minimize() OVERRIDE; - virtual void Restore() OVERRIDE; - virtual void SetCursor(PlatformCursor cursor) OVERRIDE; - virtual void MoveCursorTo(const gfx::Point& location) OVERRIDE; + virtual void Show() override; + virtual void Hide() override; + virtual void Close() override; + virtual void SetBounds(const gfx::Rect& bounds) override; + virtual gfx::Rect GetBounds() override; + virtual void SetCapture() override; + virtual void ReleaseCapture() override; + virtual void ToggleFullscreen() override; + virtual void Maximize() override; + virtual void Minimize() override; + virtual void Restore() override; + virtual void SetCursor(PlatformCursor cursor) override; + virtual void MoveCursorTo(const gfx::Point& location) override; CR_BEGIN_MSG_MAP_EX(WinWindow) CR_MESSAGE_RANGE_HANDLER_EX(WM_MOUSEFIRST, WM_MOUSELAST, OnMouseRange) diff --git a/ui/platform_window/x11/x11_window.h b/ui/platform_window/x11/x11_window.h index 29fd63c..6e1184c 100644 --- a/ui/platform_window/x11/x11_window.h +++ b/ui/platform_window/x11/x11_window.h @@ -29,23 +29,23 @@ class X11_WINDOW_EXPORT X11Window : public PlatformWindow, void ProcessXInput2Event(XEvent* xevent); // PlatformWindow: - virtual void Show() OVERRIDE; - virtual void Hide() OVERRIDE; - virtual void Close() OVERRIDE; - virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; - virtual gfx::Rect GetBounds() OVERRIDE; - virtual void SetCapture() OVERRIDE; - virtual void ReleaseCapture() OVERRIDE; - virtual void ToggleFullscreen() OVERRIDE; - virtual void Maximize() OVERRIDE; - virtual void Minimize() OVERRIDE; - virtual void Restore() OVERRIDE; - virtual void SetCursor(PlatformCursor cursor) OVERRIDE; - virtual void MoveCursorTo(const gfx::Point& location) OVERRIDE; + virtual void Show() override; + virtual void Hide() override; + virtual void Close() override; + virtual void SetBounds(const gfx::Rect& bounds) override; + virtual gfx::Rect GetBounds() override; + virtual void SetCapture() override; + virtual void ReleaseCapture() override; + virtual void ToggleFullscreen() override; + virtual void Maximize() override; + virtual void Minimize() override; + virtual void Restore() override; + virtual void SetCursor(PlatformCursor cursor) override; + virtual void MoveCursorTo(const gfx::Point& location) override; // PlatformEventDispatcher: - virtual bool CanDispatchEvent(const PlatformEvent& event) OVERRIDE; - virtual uint32_t DispatchEvent(const PlatformEvent& event) OVERRIDE; + virtual bool CanDispatchEvent(const PlatformEvent& event) override; + virtual uint32_t DispatchEvent(const PlatformEvent& event) override; PlatformWindowDelegate* delegate_; diff --git a/ui/shell_dialogs/select_file_dialog_android.h b/ui/shell_dialogs/select_file_dialog_android.h index a9d0d54..90abdbb 100644 --- a/ui/shell_dialogs/select_file_dialog_android.h +++ b/ui/shell_dialogs/select_file_dialog_android.h @@ -31,8 +31,8 @@ class SelectFileDialogImpl : public SelectFileDialog { void OnFileNotSelected(JNIEnv* env, jobject java_object); // From SelectFileDialog - virtual bool IsRunning(gfx::NativeWindow) const OVERRIDE; - virtual void ListenerDestroyed() OVERRIDE; + virtual bool IsRunning(gfx::NativeWindow) const override; + virtual void ListenerDestroyed() override; // Called when it is time to display the file picker. // params is expected to be a vector<string16> with accept_types first and @@ -45,7 +45,7 @@ class SelectFileDialogImpl : public SelectFileDialog { int file_type_index, const std::string& default_extension, gfx::NativeWindow owning_window, - void* params) OVERRIDE; + void* params) override; static bool RegisterSelectFileDialog(JNIEnv* env); @@ -55,7 +55,7 @@ class SelectFileDialogImpl : public SelectFileDialog { private: SelectFileDialogImpl(Listener* listener, SelectFilePolicy* policy); - virtual bool HasMultipleFileTypeChoicesImpl() OVERRIDE; + virtual bool HasMultipleFileTypeChoicesImpl() override; base::android::ScopedJavaGlobalRef<jobject> java_object_; diff --git a/ui/shell_dialogs/select_file_dialog_mac.mm b/ui/shell_dialogs/select_file_dialog_mac.mm index 3844b06..da32582 100644 --- a/ui/shell_dialogs/select_file_dialog_mac.mm +++ b/ui/shell_dialogs/select_file_dialog_mac.mm @@ -64,8 +64,8 @@ class SelectFileDialogImpl : public ui::SelectFileDialog { ui::SelectFilePolicy* policy); // BaseShellDialog implementation. - virtual bool IsRunning(gfx::NativeWindow parent_window) const OVERRIDE; - virtual void ListenerDestroyed() OVERRIDE; + virtual bool IsRunning(gfx::NativeWindow parent_window) const override; + virtual void ListenerDestroyed() override; // Callback from ObjC bridge. void FileWasSelected(NSSavePanel* dialog, @@ -88,7 +88,7 @@ class SelectFileDialogImpl : public ui::SelectFileDialog { int file_type_index, const base::FilePath::StringType& default_extension, gfx::NativeWindow owning_window, - void* params) OVERRIDE; + void* params) override; private: virtual ~SelectFileDialogImpl(); @@ -97,7 +97,7 @@ class SelectFileDialogImpl : public ui::SelectFileDialog { NSView* GetAccessoryView(const FileTypeInfo* file_types, int file_type_index); - virtual bool HasMultipleFileTypeChoicesImpl() OVERRIDE; + virtual bool HasMultipleFileTypeChoicesImpl() override; // The bridge for results from Cocoa to return to us. base::scoped_nsobject<SelectFileDialogBridge> bridge_; diff --git a/ui/shell_dialogs/select_file_dialog_win.cc b/ui/shell_dialogs/select_file_dialog_win.cc index 94949e5..6e1a8ab 100644 --- a/ui/shell_dialogs/select_file_dialog_win.cc +++ b/ui/shell_dialogs/select_file_dialog_win.cc @@ -168,8 +168,8 @@ class SelectFileDialogImpl : public ui::SelectFileDialog, const base::Callback<bool(OPENFILENAME*)>& get_save_file_name_impl); // BaseShellDialog implementation: - virtual bool IsRunning(gfx::NativeWindow owning_window) const OVERRIDE; - virtual void ListenerDestroyed() OVERRIDE; + virtual bool IsRunning(gfx::NativeWindow owning_window) const override; + virtual void ListenerDestroyed() override; protected: // SelectFileDialog implementation: @@ -181,7 +181,7 @@ class SelectFileDialogImpl : public ui::SelectFileDialog, int file_type_index, const base::FilePath::StringType& default_extension, gfx::NativeWindow owning_window, - void* params) OVERRIDE; + void* params) override; private: virtual ~SelectFileDialogImpl(); @@ -289,7 +289,7 @@ class SelectFileDialogImpl : public ui::SelectFileDialog, LPARAM parameter, LPARAM data); - virtual bool HasMultipleFileTypeChoicesImpl() OVERRIDE; + virtual bool HasMultipleFileTypeChoicesImpl() override; // Returns the filter to be used while displaying the open/save file dialog. // This is computed from the extensions for the file types being opened. diff --git a/ui/snapshot/snapshot_aura_unittest.cc b/ui/snapshot/snapshot_aura_unittest.cc index 018394b..c8e19d6 100644 --- a/ui/snapshot/snapshot_aura_unittest.cc +++ b/ui/snapshot/snapshot_aura_unittest.cc @@ -43,7 +43,7 @@ class TestPaintingWindowDelegate : public aura::test::TestWindowDelegate { virtual ~TestPaintingWindowDelegate() { } - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { + virtual void OnPaint(gfx::Canvas* canvas) override { for (int y = 0; y < window_size_.height(); ++y) { for (int x = 0; x < window_size_.width(); ++x) canvas->FillRect(gfx::Rect(x, y, 1, 1), GetExpectedColorForPoint(x, y)); @@ -84,7 +84,7 @@ class SnapshotAuraTest : public testing::Test { SnapshotAuraTest() {} virtual ~SnapshotAuraTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { testing::Test::SetUp(); // The ContextFactory must exist before any Compositors are created. @@ -99,7 +99,7 @@ class SnapshotAuraTest : public testing::Test { new ::wm::DefaultActivationClient(helper_->root_window()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { test_window_.reset(); delegate_.reset(); helper_->RunAllPendingInMessageLoop(); diff --git a/ui/v2/src/view.cc b/ui/v2/src/view.cc index 4185465..d973630 100644 --- a/ui/v2/src/view.cc +++ b/ui/v2/src/view.cc @@ -125,13 +125,13 @@ class ViewLayerOwner : public ui::LayerOwner, private: // Overridden from ui::LayerDelegate: - virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE { + virtual void OnPaintLayer(gfx::Canvas* canvas) override { // TODO(beng): paint processor. } - virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE { + virtual void OnDeviceScaleFactorChanged(float device_scale_factor) override { // TODO(beng): ??? } - virtual base::Closure PrepareForLayerBoundsChange() OVERRIDE { + virtual base::Closure PrepareForLayerBoundsChange() override { return base::Bind(&ViewLayerOwner::OnLayerBoundsChanged, base::Unretained(this)); } diff --git a/ui/v2/src/view_unittest.cc b/ui/v2/src/view_unittest.cc index c0253ed..b2971fa 100644 --- a/ui/v2/src/view_unittest.cc +++ b/ui/v2/src/view_unittest.cc @@ -138,7 +138,7 @@ class TreeChangeObserver : public ViewObserver { private: // Overridden from ViewObserver: - virtual void OnViewTreeChange(const TreeChangeParams& params) OVERRIDE { + virtual void OnViewTreeChange(const TreeChangeParams& params) override { received_params_.push_back(params); } @@ -394,7 +394,7 @@ class VisibilityObserver : public ViewObserver { // Overridden from ViewObserver: virtual void OnViewVisibilityChange( View* view, - ViewObserver::DispositionChangePhase phase) OVERRIDE { + ViewObserver::DispositionChangePhase phase) override { DCHECK_EQ(view_, view); log_entries_.push_back(std::make_pair(phase, view->visible())); } @@ -436,7 +436,7 @@ class BoundsObserver : public ViewObserver { private: virtual void OnViewBoundsChanged(View* view, const gfx::Rect& old_bounds, - const gfx::Rect& new_bounds) OVERRIDE { + const gfx::Rect& new_bounds) override { DCHECK_EQ(view_, view); bounds_changes_.push_back(std::make_pair(old_bounds, new_bounds)); } diff --git a/ui/views/accessibility/ax_view_obj_wrapper.h b/ui/views/accessibility/ax_view_obj_wrapper.h index 6838d07..7a768b7 100644 --- a/ui/views/accessibility/ax_view_obj_wrapper.h +++ b/ui/views/accessibility/ax_view_obj_wrapper.h @@ -17,15 +17,15 @@ class AXViewObjWrapper : public AXAuraObjWrapper { virtual ~AXViewObjWrapper(); // AXAuraObjWrapper overrides. - virtual AXAuraObjWrapper* GetParent() OVERRIDE; + virtual AXAuraObjWrapper* GetParent() override; virtual void GetChildren( - std::vector<AXAuraObjWrapper*>* out_children) OVERRIDE; - virtual void Serialize(ui::AXNodeData* out_node_data) OVERRIDE; - virtual int32 GetID() OVERRIDE; - virtual void DoDefault() OVERRIDE; - virtual void Focus() OVERRIDE; - virtual void MakeVisible() OVERRIDE; - virtual void SetSelection(int32 start, int32 end) OVERRIDE; + std::vector<AXAuraObjWrapper*>* out_children) override; + virtual void Serialize(ui::AXNodeData* out_node_data) override; + virtual int32 GetID() override; + virtual void DoDefault() override; + virtual void Focus() override; + virtual void MakeVisible() override; + virtual void SetSelection(int32 start, int32 end) override; private: View* view_; diff --git a/ui/views/accessibility/ax_widget_obj_wrapper.h b/ui/views/accessibility/ax_widget_obj_wrapper.h index 61ff1e9..52c03ca 100644 --- a/ui/views/accessibility/ax_widget_obj_wrapper.h +++ b/ui/views/accessibility/ax_widget_obj_wrapper.h @@ -21,17 +21,17 @@ class AXWidgetObjWrapper : public AXAuraObjWrapper, virtual ~AXWidgetObjWrapper(); // AXAuraObjWrapper overrides. - virtual AXAuraObjWrapper* GetParent() OVERRIDE; + virtual AXAuraObjWrapper* GetParent() override; virtual void GetChildren( - std::vector<AXAuraObjWrapper*>* out_children) OVERRIDE; - virtual void Serialize(ui::AXNodeData* out_node_data) OVERRIDE; - virtual int32 GetID() OVERRIDE; + std::vector<AXAuraObjWrapper*>* out_children) override; + virtual void Serialize(ui::AXNodeData* out_node_data) override; + virtual int32 GetID() override; // WidgetObserver overrides. - virtual void OnWidgetDestroying(Widget* widget) OVERRIDE; + virtual void OnWidgetDestroying(Widget* widget) override; // WidgetRemovalsObserver overrides. - virtual void OnWillRemoveView(Widget* widget, View* view) OVERRIDE; + virtual void OnWillRemoveView(Widget* widget, View* view) override; private: Widget* widget_; diff --git a/ui/views/accessibility/ax_window_obj_wrapper.h b/ui/views/accessibility/ax_window_obj_wrapper.h index b3cd235..14bf2a8 100644 --- a/ui/views/accessibility/ax_window_obj_wrapper.h +++ b/ui/views/accessibility/ax_window_obj_wrapper.h @@ -22,14 +22,14 @@ class AXWindowObjWrapper : public AXAuraObjWrapper, virtual ~AXWindowObjWrapper(); // AXAuraObjWrapper overrides. - virtual AXAuraObjWrapper* GetParent() OVERRIDE; + virtual AXAuraObjWrapper* GetParent() override; virtual void GetChildren( - std::vector<AXAuraObjWrapper*>* out_children) OVERRIDE; - virtual void Serialize(ui::AXNodeData* out_node_data) OVERRIDE; - virtual int32 GetID() OVERRIDE; + std::vector<AXAuraObjWrapper*>* out_children) override; + virtual void Serialize(ui::AXNodeData* out_node_data) override; + virtual int32 GetID() override; // WindowObserver overrides. - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; + virtual void OnWindowDestroying(aura::Window* window) override; private: aura::Window* window_; diff --git a/ui/views/accessibility/native_view_accessibility.h b/ui/views/accessibility/native_view_accessibility.h index 3f36f57..a85dc0c 100644 --- a/ui/views/accessibility/native_view_accessibility.h +++ b/ui/views/accessibility/native_view_accessibility.h @@ -32,12 +32,12 @@ class VIEWS_EXPORT NativeViewAccessibility : public ui::AXPlatformNodeDelegate { static void UnregisterWebView(View* web_view); // ui::AXPlatformNodeDelegate - virtual ui::AXNodeData* GetData() OVERRIDE; - virtual int GetChildCount() OVERRIDE; - virtual gfx::NativeViewAccessible ChildAtIndex(int index) OVERRIDE; - virtual gfx::NativeViewAccessible GetParent() OVERRIDE; - virtual gfx::Vector2d GetGlobalCoordinateOffset() OVERRIDE; - virtual void NotifyAccessibilityEvent(ui::AXEvent event_type) OVERRIDE; + virtual ui::AXNodeData* GetData() override; + virtual int GetChildCount() override; + virtual gfx::NativeViewAccessible ChildAtIndex(int index) override; + virtual gfx::NativeViewAccessible GetParent() override; + virtual gfx::Vector2d GetGlobalCoordinateOffset() override; + virtual void NotifyAccessibilityEvent(ui::AXEvent event_type) override; protected: NativeViewAccessibility(); diff --git a/ui/views/accessibility/native_view_accessibility_unittest.cc b/ui/views/accessibility/native_view_accessibility_unittest.cc index cf5f5de..c376bbf 100644 --- a/ui/views/accessibility/native_view_accessibility_unittest.cc +++ b/ui/views/accessibility/native_view_accessibility_unittest.cc @@ -28,7 +28,7 @@ class NativeViewAccessibilityTest : public ViewsTestBase { NativeViewAccessibilityTest() {} virtual ~NativeViewAccessibilityTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ViewsTestBase::SetUp(); button_.reset(new TestButton()); button_->SetSize(gfx::Size(20, 20)); @@ -39,7 +39,7 @@ class NativeViewAccessibilityTest : public ViewsTestBase { label_accessibility_ = NativeViewAccessibility::Create(label_.get()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { button_accessibility_->Destroy(); button_accessibility_ = NULL; label_accessibility_->Destroy(); diff --git a/ui/views/accessibility/native_view_accessibility_win.h b/ui/views/accessibility/native_view_accessibility_win.h index b9a77f5..2f629ca 100644 --- a/ui/views/accessibility/native_view_accessibility_win.h +++ b/ui/views/accessibility/native_view_accessibility_win.h @@ -62,9 +62,9 @@ NativeViewAccessibilityWin // NativeViewAccessibility. virtual void NotifyAccessibilityEvent( - ui::AXEvent event_type) OVERRIDE; - virtual gfx::NativeViewAccessible GetNativeObject() OVERRIDE; - virtual void Destroy() OVERRIDE; + ui::AXEvent event_type) override; + virtual gfx::NativeViewAccessible GetNativeObject() override; + virtual void Destroy() override; // Supported IAccessible methods. diff --git a/ui/views/accessible_pane_view.cc b/ui/views/accessible_pane_view.cc index 84fccdc..c89dc46 100644 --- a/ui/views/accessible_pane_view.cc +++ b/ui/views/accessible_pane_view.cc @@ -24,14 +24,14 @@ class AccessiblePaneViewFocusSearch : public FocusSearch { accessible_pane_view_(pane_view) {} protected: - virtual View* GetParent(View* v) OVERRIDE { + virtual View* GetParent(View* v) override { return accessible_pane_view_->ContainsForFocusSearch(root(), v) ? accessible_pane_view_->GetParentForFocusSearch(v) : NULL; } // Returns true if |v| is contained within the hierarchy rooted at |root|. // Subclasses can override this if they need custom focus search behavior. - virtual bool Contains(View* root, const View* v) OVERRIDE { + virtual bool Contains(View* root, const View* v) override { return accessible_pane_view_->ContainsForFocusSearch(root, v); } diff --git a/ui/views/accessible_pane_view.h b/ui/views/accessible_pane_view.h index 11ea448..345e928 100644 --- a/ui/views/accessible_pane_view.h +++ b/ui/views/accessible_pane_view.h @@ -40,23 +40,23 @@ class VIEWS_EXPORT AccessiblePaneView : public View, virtual bool SetPaneFocusAndFocusDefault(); // Overridden from View: - virtual FocusTraversable* GetPaneFocusTraversable() OVERRIDE; + virtual FocusTraversable* GetPaneFocusTraversable() override; virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) - OVERRIDE; - virtual void SetVisible(bool flag) OVERRIDE; - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; - virtual void RequestFocus() OVERRIDE; + override; + virtual void SetVisible(bool flag) override; + virtual void GetAccessibleState(ui::AXViewState* state) override; + virtual void RequestFocus() override; // Overridden from FocusChangeListener: virtual void OnWillChangeFocus(View* focused_before, - View* focused_now) OVERRIDE; + View* focused_now) override; virtual void OnDidChangeFocus(View* focused_before, - View* focused_now) OVERRIDE; + View* focused_now) override; // Overridden from FocusTraversable: - virtual FocusSearch* GetFocusSearch() OVERRIDE; - virtual FocusTraversable* GetFocusTraversableParent() OVERRIDE; - virtual View* GetFocusTraversableParentView() OVERRIDE; + virtual FocusSearch* GetFocusSearch() override; + virtual FocusTraversable* GetFocusTraversableParent() override; + virtual View* GetFocusTraversableParentView() override; // For testing only. const ui::Accelerator& home_key() const { return home_key_; } diff --git a/ui/views/accessible_pane_view_unittest.cc b/ui/views/accessible_pane_view_unittest.cc index 4468f2f..126fc91 100644 --- a/ui/views/accessible_pane_view_unittest.cc +++ b/ui/views/accessible_pane_view_unittest.cc @@ -24,7 +24,7 @@ class TestBarView : public AccessiblePaneView, virtual ~TestBarView(); virtual void ButtonPressed(Button* sender, - const ui::Event& event) OVERRIDE; + const ui::Event& event) override; LabelButton* child_button() const { return child_button_.get(); } LabelButton* second_child_button() const { return second_child_button_.get(); @@ -32,7 +32,7 @@ class TestBarView : public AccessiblePaneView, LabelButton* third_child_button() const { return third_child_button_.get(); } LabelButton* not_child_button() const { return not_child_button_.get(); } - virtual View* GetDefaultFocusableChild() OVERRIDE; + virtual View* GetDefaultFocusableChild() override; private: void Init(); diff --git a/ui/views/animation/bounds_animator.h b/ui/views/animation/bounds_animator.h index 1a88cdf..0abc37a 100644 --- a/ui/views/animation/bounds_animator.h +++ b/ui/views/animation/bounds_animator.h @@ -144,15 +144,15 @@ class VIEWS_EXPORT BoundsAnimator : public gfx::AnimationDelegate, AnimationEndType type); // gfx::AnimationDelegate overrides. - virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE; - virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE; - virtual void AnimationCanceled(const gfx::Animation* animation) OVERRIDE; + virtual void AnimationProgressed(const gfx::Animation* animation) override; + virtual void AnimationEnded(const gfx::Animation* animation) override; + virtual void AnimationCanceled(const gfx::Animation* animation) override; // gfx::AnimationContainerObserver overrides. virtual void AnimationContainerProgressed( - gfx::AnimationContainer* container) OVERRIDE; + gfx::AnimationContainer* container) override; virtual void AnimationContainerEmpty( - gfx::AnimationContainer* container) OVERRIDE; + gfx::AnimationContainer* container) override; // Parent of all views being animated. View* parent_; diff --git a/ui/views/animation/bounds_animator_unittest.cc b/ui/views/animation/bounds_animator_unittest.cc index 6294d8a..b8f62a2 100644 --- a/ui/views/animation/bounds_animator_unittest.cc +++ b/ui/views/animation/bounds_animator_unittest.cc @@ -22,7 +22,7 @@ class TestBoundsAnimator : public BoundsAnimator { } protected: - virtual SlideAnimation* CreateAnimation() OVERRIDE { + virtual SlideAnimation* CreateAnimation() override { SlideAnimation* animation = BoundsAnimator::CreateAnimation(); animation->SetSlideDuration(10); return animation; @@ -53,7 +53,7 @@ class OwnedDelegate : public gfx::AnimationDelegate { } // Overridden from gfx::AnimationDelegate: - virtual void AnimationCanceled(const Animation* animation) OVERRIDE { + virtual void AnimationCanceled(const Animation* animation) override { canceled_ = true; } @@ -72,7 +72,7 @@ class TestView : public View { public: TestView() {} - virtual void SchedulePaintInRect(const gfx::Rect& r) OVERRIDE { + virtual void SchedulePaintInRect(const gfx::Rect& r) override { if (dirty_rect_.IsEmpty()) dirty_rect_ = r; else diff --git a/ui/views/animation/scroll_animator.h b/ui/views/animation/scroll_animator.h index 525a998..b941cdb 100644 --- a/ui/views/animation/scroll_animator.h +++ b/ui/views/animation/scroll_animator.h @@ -41,9 +41,9 @@ class VIEWS_EXPORT ScrollAnimator : public gfx::AnimationDelegate { private: // Implementation of gfx::AnimationDelegate. - virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE; - virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE; - virtual void AnimationCanceled(const gfx::Animation* animation) OVERRIDE; + virtual void AnimationEnded(const gfx::Animation* animation) override; + virtual void AnimationProgressed(const gfx::Animation* animation) override; + virtual void AnimationCanceled(const gfx::Animation* animation) override; ScrollDelegate* delegate_; diff --git a/ui/views/background.cc b/ui/views/background.cc index bb2ddd0..d2d64bb 100644 --- a/ui/views/background.cc +++ b/ui/views/background.cc @@ -22,7 +22,7 @@ class SolidBackground : public Background { SetNativeControlColor(color); } - virtual void Paint(gfx::Canvas* canvas, View* view) const OVERRIDE { + virtual void Paint(gfx::Canvas* canvas, View* view) const override { // Fill the background. Note that we don't constrain to the bounds as // canvas is already clipped for us. canvas->DrawColor(get_color()); @@ -45,7 +45,7 @@ class BackgroundPainter : public Background { } - virtual void Paint(gfx::Canvas* canvas, View* view) const OVERRIDE { + virtual void Paint(gfx::Canvas* canvas, View* view) const override { Painter::PaintPainterAt(canvas, painter_, view->GetLocalBounds()); } diff --git a/ui/views/border.cc b/ui/views/border.cc index 0ff3406..dac2daa 100644 --- a/ui/views/border.cc +++ b/ui/views/border.cc @@ -20,9 +20,9 @@ class SidedSolidBorder : public Border { SidedSolidBorder(int top, int left, int bottom, int right, SkColor color); // Overridden from Border: - virtual void Paint(const View& view, gfx::Canvas* canvas) OVERRIDE; - virtual gfx::Insets GetInsets() const OVERRIDE; - virtual gfx::Size GetMinimumSize() const OVERRIDE; + virtual void Paint(const View& view, gfx::Canvas* canvas) override; + virtual gfx::Insets GetInsets() const override; + virtual gfx::Size GetMinimumSize() const override; private: const SkColor color_; @@ -78,13 +78,13 @@ class EmptyBorder : public Border { : insets_(top, left, bottom, right) {} // Overridden from Border: - virtual void Paint(const View& view, gfx::Canvas* canvas) OVERRIDE {} + virtual void Paint(const View& view, gfx::Canvas* canvas) override {} - virtual gfx::Insets GetInsets() const OVERRIDE { + virtual gfx::Insets GetInsets() const override { return insets_; } - virtual gfx::Size GetMinimumSize() const OVERRIDE { + virtual gfx::Size GetMinimumSize() const override { return gfx::Size(); } @@ -105,15 +105,15 @@ class BorderPainter : public Border { virtual ~BorderPainter() {} // Overridden from Border: - virtual void Paint(const View& view, gfx::Canvas* canvas) OVERRIDE { + virtual void Paint(const View& view, gfx::Canvas* canvas) override { Painter::PaintPainterAt(canvas, painter_.get(), view.GetLocalBounds()); } - virtual gfx::Insets GetInsets() const OVERRIDE { + virtual gfx::Insets GetInsets() const override { return insets_; } - virtual gfx::Size GetMinimumSize() const OVERRIDE { + virtual gfx::Size GetMinimumSize() const override { return painter_->GetMinimumSize(); } diff --git a/ui/views/bubble/bubble_border.h b/ui/views/bubble/bubble_border.h index 8ce546a..8fc149b 100644 --- a/ui/views/bubble/bubble_border.h +++ b/ui/views/bubble/bubble_border.h @@ -196,9 +196,9 @@ class VIEWS_EXPORT BubbleBorder : public Border { int GetArrowOffset(const gfx::Size& border_size) const; // Overridden from Border: - virtual void Paint(const View& view, gfx::Canvas* canvas) OVERRIDE; - virtual gfx::Insets GetInsets() const OVERRIDE; - virtual gfx::Size GetMinimumSize() const OVERRIDE; + virtual void Paint(const View& view, gfx::Canvas* canvas) override; + virtual gfx::Insets GetInsets() const override; + virtual gfx::Size GetMinimumSize() const override; private: FRIEND_TEST_ALL_PREFIXES(BubbleBorderTest, GetSizeForContentsSizeTest); @@ -233,7 +233,7 @@ class VIEWS_EXPORT BubbleBackground : public Background { explicit BubbleBackground(BubbleBorder* border) : border_(border) {} // Overridden from Background: - virtual void Paint(gfx::Canvas* canvas, View* view) const OVERRIDE; + virtual void Paint(gfx::Canvas* canvas, View* view) const override; private: BubbleBorder* border_; diff --git a/ui/views/bubble/bubble_delegate.h b/ui/views/bubble/bubble_delegate.h index 739ec92..5f21313 100644 --- a/ui/views/bubble/bubble_delegate.h +++ b/ui/views/bubble/bubble_delegate.h @@ -33,21 +33,21 @@ class VIEWS_EXPORT BubbleDelegateView : public WidgetDelegateView, static Widget* CreateBubble(BubbleDelegateView* bubble_delegate); // WidgetDelegateView overrides: - virtual BubbleDelegateView* AsBubbleDelegate() OVERRIDE; - virtual bool ShouldShowCloseButton() const OVERRIDE; - virtual View* GetContentsView() OVERRIDE; - virtual NonClientFrameView* CreateNonClientFrameView(Widget* widget) OVERRIDE; - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; + virtual BubbleDelegateView* AsBubbleDelegate() override; + virtual bool ShouldShowCloseButton() const override; + virtual View* GetContentsView() override; + virtual NonClientFrameView* CreateNonClientFrameView(Widget* widget) override; + virtual void GetAccessibleState(ui::AXViewState* state) override; // WidgetObserver overrides: - virtual void OnWidgetDestroying(Widget* widget) OVERRIDE; + virtual void OnWidgetDestroying(Widget* widget) override; virtual void OnWidgetVisibilityChanging(Widget* widget, bool visible) - OVERRIDE; + override; virtual void OnWidgetVisibilityChanged(Widget* widget, bool visible) - OVERRIDE; - virtual void OnWidgetActivationChanged(Widget* widget, bool active) OVERRIDE; + override; + virtual void OnWidgetActivationChanged(Widget* widget, bool active) override; virtual void OnWidgetBoundsChanged(Widget* widget, - const gfx::Rect& new_bounds) OVERRIDE; + const gfx::Rect& new_bounds) override; bool close_on_esc() const { return close_on_esc_; } void set_close_on_esc(bool close_on_esc) { close_on_esc_ = close_on_esc; } @@ -119,8 +119,8 @@ class VIEWS_EXPORT BubbleDelegateView : public WidgetDelegateView, virtual const gfx::FontList& GetTitleFontList() const; // View overrides: - virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; - virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) OVERRIDE; + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) override; + virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) override; // Perform view initialization on the contents for bubble sizing. virtual void Init(); diff --git a/ui/views/bubble/bubble_delegate_unittest.cc b/ui/views/bubble/bubble_delegate_unittest.cc index a0cd57b..c3ba170 100644 --- a/ui/views/bubble/bubble_delegate_unittest.cc +++ b/ui/views/bubble/bubble_delegate_unittest.cc @@ -33,8 +33,8 @@ class TestBubbleDelegateView : public BubbleDelegateView { } // BubbleDelegateView overrides: - virtual View* GetInitiallyFocusedView() OVERRIDE { return view_; } - virtual gfx::Size GetPreferredSize() const OVERRIDE { + virtual View* GetInitiallyFocusedView() override { return view_; } + virtual gfx::Size GetPreferredSize() const override { return gfx::Size(200, 200); } diff --git a/ui/views/bubble/bubble_frame_view.h b/ui/views/bubble/bubble_frame_view.h index f14ca1e..1d3add7 100644 --- a/ui/views/bubble/bubble_frame_view.h +++ b/ui/views/bubble/bubble_frame_view.h @@ -40,33 +40,33 @@ class VIEWS_EXPORT BubbleFrameView : public NonClientFrameView, static LabelButton* CreateCloseButton(ButtonListener* listener); // NonClientFrameView overrides: - virtual gfx::Rect GetBoundsForClientView() const OVERRIDE; + virtual gfx::Rect GetBoundsForClientView() const override; virtual gfx::Rect GetWindowBoundsForClientBounds( - const gfx::Rect& client_bounds) const OVERRIDE; - virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE; + const gfx::Rect& client_bounds) const override; + virtual int NonClientHitTest(const gfx::Point& point) override; virtual void GetWindowMask(const gfx::Size& size, - gfx::Path* window_mask) OVERRIDE; - virtual void ResetWindowControls() OVERRIDE; - virtual void UpdateWindowIcon() OVERRIDE; - virtual void UpdateWindowTitle() OVERRIDE; - virtual void SizeConstraintsChanged() OVERRIDE; + gfx::Path* window_mask) override; + virtual void ResetWindowControls() override; + virtual void UpdateWindowIcon() override; + virtual void UpdateWindowTitle() override; + virtual void SizeConstraintsChanged() override; // Set the FontList to be used for the title of the bubble. // Caller must arrange to update the layout to have the call take effect. void SetTitleFontList(const gfx::FontList& font_list); // View overrides: - virtual gfx::Insets GetInsets() const OVERRIDE; - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual gfx::Size GetMinimumSize() const OVERRIDE; - virtual void Layout() OVERRIDE; - virtual const char* GetClassName() const OVERRIDE; - virtual void ChildPreferredSizeChanged(View* child) OVERRIDE; - virtual void OnThemeChanged() OVERRIDE; - virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) OVERRIDE; + virtual gfx::Insets GetInsets() const override; + virtual gfx::Size GetPreferredSize() const override; + virtual gfx::Size GetMinimumSize() const override; + virtual void Layout() override; + virtual const char* GetClassName() const override; + virtual void ChildPreferredSizeChanged(View* child) override; + virtual void OnThemeChanged() override; + virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) override; // Overridden from ButtonListener: - virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; + virtual void ButtonPressed(Button* sender, const ui::Event& event) override; // Use bubble_border() and SetBubbleBorder(), not border() and SetBorder(). BubbleBorder* bubble_border() const { return bubble_border_; } diff --git a/ui/views/bubble/bubble_frame_view_unittest.cc b/ui/views/bubble/bubble_frame_view_unittest.cc index 1bd9e34..545ca38 100644 --- a/ui/views/bubble/bubble_frame_view_unittest.cc +++ b/ui/views/bubble/bubble_frame_view_unittest.cc @@ -29,7 +29,7 @@ class TestBubbleFrameView : public BubbleFrameView { virtual ~TestBubbleFrameView() {} // BubbleFrameView overrides: - virtual gfx::Rect GetAvailableScreenBounds(const gfx::Rect& rect) OVERRIDE { + virtual gfx::Rect GetAvailableScreenBounds(const gfx::Rect& rect) override { return available_bounds_; } diff --git a/ui/views/bubble/bubble_window_targeter.h b/ui/views/bubble/bubble_window_targeter.h index 45b1d5c..b37eaa0 100644 --- a/ui/views/bubble/bubble_window_targeter.h +++ b/ui/views/bubble/bubble_window_targeter.h @@ -23,7 +23,7 @@ class VIEWS_EXPORT BubbleWindowTargeter private: // wm::MaskedWindowTargeter: virtual bool GetHitTestMask(aura::Window* window, - gfx::Path* mask) const OVERRIDE; + gfx::Path* mask) const override; views::BubbleDelegateView* bubble_; diff --git a/ui/views/bubble/bubble_window_targeter_unittest.cc b/ui/views/bubble/bubble_window_targeter_unittest.cc index 479f6e9..4ff0e0a 100644 --- a/ui/views/bubble/bubble_window_targeter_unittest.cc +++ b/ui/views/bubble/bubble_window_targeter_unittest.cc @@ -26,7 +26,7 @@ class WidgetOwnsNativeBubble : public BubbleDelegateView { private: // BubbleDelegateView: virtual void OnBeforeBubbleWidgetInit(Widget::InitParams* params, - Widget* widget) const OVERRIDE { + Widget* widget) const override { params->ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; } @@ -42,7 +42,7 @@ class BubbleWindowTargeterTest : public ViewsTestBase { } virtual ~BubbleWindowTargeterTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ViewsTestBase::SetUp(); CreateAnchorWidget(); CreateBubbleWidget(); @@ -51,7 +51,7 @@ class BubbleWindowTargeterTest : public ViewsTestBase { bubble_widget()->Show(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { bubble_delegate_ = NULL; bubble_widget_.reset(); anchor_.reset(); diff --git a/ui/views/bubble/tray_bubble_view.cc b/ui/views/bubble/tray_bubble_view.cc index d1cf48e..53cb526 100644 --- a/ui/views/bubble/tray_bubble_view.cc +++ b/ui/views/bubble/tray_bubble_view.cc @@ -56,7 +56,7 @@ class MouseMoveDetectorHost : public MouseWatcherHost { virtual ~MouseMoveDetectorHost(); virtual bool Contains(const gfx::Point& screen_point, - MouseEventType type) OVERRIDE; + MouseEventType type) override; private: DISALLOW_COPY_AND_ASSIGN(MouseMoveDetectorHost); }; @@ -94,7 +94,7 @@ class TrayBubbleBorder : public BubbleBorder { // Overridden from BubbleBorder. // Sets the bubble on top of the anchor when it has no arrow. virtual gfx::Rect GetBounds(const gfx::Rect& position_relative_to, - const gfx::Size& contents_size) const OVERRIDE { + const gfx::Size& contents_size) const override { if (has_arrow(arrow())) { gfx::Rect rect = BubbleBorder::GetBounds(position_relative_to, contents_size); @@ -182,11 +182,11 @@ class TrayBubbleContentMask : public ui::LayerDelegate { ui::Layer* layer() { return &layer_; } // Overridden from LayerDelegate. - virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE; + virtual void OnPaintLayer(gfx::Canvas* canvas) override; virtual void OnDelegatedFrameDamage( - const gfx::Rect& damage_rect_in_dip) OVERRIDE {} - virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE; - virtual base::Closure PrepareForLayerBoundsChange() OVERRIDE; + const gfx::Rect& damage_rect_in_dip) override {} + virtual void OnDeviceScaleFactorChanged(float device_scale_factor) override; + virtual base::Closure PrepareForLayerBoundsChange() override; private: ui::Layer layer_; @@ -234,7 +234,7 @@ class BottomAlignedBoxLayout : public BoxLayout { virtual ~BottomAlignedBoxLayout() {} private: - virtual void Layout(View* host) OVERRIDE { + virtual void Layout(View* host) override { if (host->height() >= host->GetPreferredSize().height() || !bubble_view_->is_gesture_dragging()) { BoxLayout::Layout(host); diff --git a/ui/views/bubble/tray_bubble_view.h b/ui/views/bubble/tray_bubble_view.h index 54f6cc8..8ffd58d 100644 --- a/ui/views/bubble/tray_bubble_view.h +++ b/ui/views/bubble/tray_bubble_view.h @@ -147,25 +147,25 @@ class VIEWS_EXPORT TrayBubbleView : public views::BubbleDelegateView, bool is_gesture_dragging() const { return is_gesture_dragging_; } // Overridden from views::WidgetDelegate. - virtual bool CanActivate() const OVERRIDE; + virtual bool CanActivate() const override; virtual views::NonClientFrameView* CreateNonClientFrameView( - views::Widget* widget) OVERRIDE; - virtual bool WidgetHasHitTestMask() const OVERRIDE; - virtual void GetWidgetHitTestMask(gfx::Path* mask) const OVERRIDE; + views::Widget* widget) override; + virtual bool WidgetHasHitTestMask() const override; + virtual void GetWidgetHitTestMask(gfx::Path* mask) const override; // Overridden from views::BubbleDelegateView. - virtual gfx::Rect GetAnchorRect() const OVERRIDE; + virtual gfx::Rect GetAnchorRect() const override; // Overridden from views::View. - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual gfx::Size GetMaximumSize() const OVERRIDE; - virtual int GetHeightForWidth(int width) const OVERRIDE; - virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE; - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual gfx::Size GetMaximumSize() const override; + virtual int GetHeightForWidth(int width) const override; + virtual void OnMouseEntered(const ui::MouseEvent& event) override; + virtual void OnMouseExited(const ui::MouseEvent& event) override; + virtual void GetAccessibleState(ui::AXViewState* state) override; // Overridden from MouseWatcherListener - virtual void MouseMovedOutOfHost() OVERRIDE; + virtual void MouseMovedOutOfHost() override; protected: TrayBubbleView(gfx::NativeView parent_window, @@ -174,12 +174,12 @@ class VIEWS_EXPORT TrayBubbleView : public views::BubbleDelegateView, const InitParams& init_params); // Overridden from views::BubbleDelegateView. - virtual void Init() OVERRIDE; + virtual void Init() override; // Overridden from views::View. - virtual void ChildPreferredSizeChanged(View* child) OVERRIDE; + virtual void ChildPreferredSizeChanged(View* child) override; virtual void ViewHierarchyChanged( - const ViewHierarchyChangedDetails& details) OVERRIDE; + const ViewHierarchyChangedDetails& details) override; private: InitParams params_; diff --git a/ui/views/cocoa/bridged_native_widget.h b/ui/views/cocoa/bridged_native_widget.h index 64cf81d..0e9d566 100644 --- a/ui/views/cocoa/bridged_native_widget.h +++ b/ui/views/cocoa/bridged_native_widget.h @@ -61,7 +61,7 @@ class VIEWS_EXPORT BridgedNativeWidget : public internal::InputMethodDelegate, NSWindow* ns_window() { return window_; } // Overridden from internal::InputMethodDelegate: - virtual void DispatchKeyEventPostIME(const ui::KeyEvent& key) OVERRIDE; + virtual void DispatchKeyEventPostIME(const ui::KeyEvent& key) override; private: // Closes all child windows. BridgedNativeWidget children will be destroyed. @@ -76,9 +76,9 @@ class VIEWS_EXPORT BridgedNativeWidget : public internal::InputMethodDelegate, // Overridden from FocusChangeListener: virtual void OnWillChangeFocus(View* focused_before, - View* focused_now) OVERRIDE; + View* focused_now) override; virtual void OnDidChangeFocus(View* focused_before, - View* focused_now) OVERRIDE; + View* focused_now) override; DISALLOW_COPY_AND_ASSIGN(BridgedNativeWidget); }; diff --git a/ui/views/cocoa/bridged_native_widget_unittest.mm b/ui/views/cocoa/bridged_native_widget_unittest.mm index 14a7f9c..750fea4 100644 --- a/ui/views/cocoa/bridged_native_widget_unittest.mm +++ b/ui/views/cocoa/bridged_native_widget_unittest.mm @@ -51,7 +51,7 @@ class MockNativeWidgetMac : public NativeWidgetMac { } // internal::NativeWidgetPrivate: - virtual void InitNativeWidget(const Widget::InitParams& params) OVERRIDE { + virtual void InitNativeWidget(const Widget::InitParams& params) override { ownership_ = params.ownership; // Usually the bridge gets initialized here. It is skipped to run extra @@ -59,7 +59,7 @@ class MockNativeWidgetMac : public NativeWidgetMac { delegate()->OnNativeWidgetCreated(true); } - virtual void ReorderNativeViews() OVERRIDE { + virtual void ReorderNativeViews() override { // Called via Widget::Init to set the content view. No-op in these tests. } @@ -80,7 +80,7 @@ class BridgedNativeWidgetTestBase : public ui::CocoaTest { } // Overridden from testing::Test: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ui::CocoaTest::SetUp(); Widget::InitParams params; @@ -109,8 +109,8 @@ class BridgedNativeWidgetTest : public BridgedNativeWidgetTestBase { std::string GetText(); // testing::Test: - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; protected: // TODO(tapted): Make this a EventCountView from widget_unittest.cc. diff --git a/ui/views/color_chooser/color_chooser_view.cc b/ui/views/color_chooser/color_chooser_view.cc index 8efdb2a..680fd30 100644 --- a/ui/views/color_chooser/color_chooser_view.cc +++ b/ui/views/color_chooser/color_chooser_view.cc @@ -66,17 +66,17 @@ class LocatedEventHandlerView : public views::View { virtual void ProcessEventAtLocation(const gfx::Point& location) = 0; // views::View overrides: - virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE { + virtual bool OnMousePressed(const ui::MouseEvent& event) override { ProcessEventAtLocation(event.location()); return true; } - virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE { + virtual bool OnMouseDragged(const ui::MouseEvent& event) override { ProcessEventAtLocation(event.location()); return true; } - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE { + virtual void OnGestureEvent(ui::GestureEvent* event) override { if (event->type() == ui::ET_GESTURE_TAP || event->type() == ui::ET_GESTURE_TAP_DOWN || event->IsScrollGestureEvent()) { @@ -123,11 +123,11 @@ class ColorChooserView::HueView : public LocatedEventHandlerView { private: // LocatedEventHandlerView overrides: - virtual void ProcessEventAtLocation(const gfx::Point& point) OVERRIDE; + virtual void ProcessEventAtLocation(const gfx::Point& point) override; // View overrides: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual void OnPaint(gfx::Canvas* canvas) override; ColorChooserView* chooser_view_; int level_; @@ -235,11 +235,11 @@ class ColorChooserView::SaturationValueView : public LocatedEventHandlerView { private: // LocatedEventHandlerView overrides: - virtual void ProcessEventAtLocation(const gfx::Point& point) OVERRIDE; + virtual void ProcessEventAtLocation(const gfx::Point& point) override; // View overrides: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual void OnPaint(gfx::Canvas* canvas) override; ColorChooserView* chooser_view_; SkScalar hue_; diff --git a/ui/views/color_chooser/color_chooser_view.h b/ui/views/color_chooser/color_chooser_view.h index c4481d3..532e823 100644 --- a/ui/views/color_chooser/color_chooser_view.h +++ b/ui/views/color_chooser/color_chooser_view.h @@ -48,17 +48,17 @@ class VIEWS_EXPORT ColorChooserView : public WidgetDelegateView, class SelectedColorPatchView; // WidgetDelegate overrides: - virtual bool CanMinimize() const OVERRIDE; - virtual View* GetInitiallyFocusedView() OVERRIDE; - virtual ui::ModalType GetModalType() const OVERRIDE; - virtual void WindowClosing() OVERRIDE; - virtual View* GetContentsView() OVERRIDE; + virtual bool CanMinimize() const override; + virtual View* GetInitiallyFocusedView() override; + virtual ui::ModalType GetModalType() const override; + virtual void WindowClosing() override; + virtual View* GetContentsView() override; // TextfieldController overrides: virtual void ContentsChanged(Textfield* sender, - const base::string16& new_contents) OVERRIDE; + const base::string16& new_contents) override; virtual bool HandleKeyEvent(Textfield* sender, - const ui::KeyEvent& key_event) OVERRIDE; + const ui::KeyEvent& key_event) override; // The current color in HSV coordinate. SkScalar hsv_[3]; diff --git a/ui/views/controls/button/blue_button.h b/ui/views/controls/button/blue_button.h index 8c83c00..cad8245 100644 --- a/ui/views/controls/button/blue_button.h +++ b/ui/views/controls/button/blue_button.h @@ -20,9 +20,9 @@ class VIEWS_EXPORT BlueButton : public LabelButton { private: // Overridden from LabelButton: - virtual void ResetColorsFromNativeTheme() OVERRIDE; - virtual const char* GetClassName() const OVERRIDE; - virtual scoped_ptr<LabelButtonBorder> CreateDefaultBorder() const OVERRIDE; + virtual void ResetColorsFromNativeTheme() override; + virtual const char* GetClassName() const override; + virtual scoped_ptr<LabelButtonBorder> CreateDefaultBorder() const override; DISALLOW_COPY_AND_ASSIGN(BlueButton); }; diff --git a/ui/views/controls/button/button.h b/ui/views/controls/button/button.h index 37d639d..6347a43 100644 --- a/ui/views/controls/button/button.h +++ b/ui/views/controls/button/button.h @@ -57,8 +57,8 @@ class VIEWS_EXPORT Button : public View { // Overridden from View: virtual bool GetTooltipText(const gfx::Point& p, - base::string16* tooltip) const OVERRIDE; - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; + base::string16* tooltip) const override; + virtual void GetAccessibleState(ui::AXViewState* state) override; protected: // Construct the Button with a Listener. The listener can be NULL. This can be diff --git a/ui/views/controls/button/checkbox.h b/ui/views/controls/button/checkbox.h index 7bfd5bc..8f473fa 100644 --- a/ui/views/controls/button/checkbox.h +++ b/ui/views/controls/button/checkbox.h @@ -32,12 +32,12 @@ class VIEWS_EXPORT Checkbox : public LabelButton { protected: // Overridden from LabelButton: - virtual void Layout() OVERRIDE; - virtual const char* GetClassName() const OVERRIDE; - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; - virtual void OnFocus() OVERRIDE; - virtual void OnBlur() OVERRIDE; - virtual const gfx::ImageSkia& GetImage(ButtonState for_state) OVERRIDE; + virtual void Layout() override; + virtual const char* GetClassName() const override; + virtual void GetAccessibleState(ui::AXViewState* state) override; + virtual void OnFocus() override; + virtual void OnBlur() override; + virtual const gfx::ImageSkia& GetImage(ButtonState for_state) override; // Set the image shown for each button state depending on whether it is // [checked] or [focused]. @@ -48,11 +48,11 @@ class VIEWS_EXPORT Checkbox : public LabelButton { private: // Overridden from Button: - virtual void NotifyClick(const ui::Event& event) OVERRIDE; + virtual void NotifyClick(const ui::Event& event) override; - virtual ui::NativeTheme::Part GetThemePart() const OVERRIDE; + virtual ui::NativeTheme::Part GetThemePart() const override; virtual void GetExtraParams( - ui::NativeTheme::ExtraParams* params) const OVERRIDE; + ui::NativeTheme::ExtraParams* params) const override; // True if the checkbox is checked. bool checked_; diff --git a/ui/views/controls/button/custom_button.h b/ui/views/controls/button/custom_button.h index 6c9a162..5b29358 100644 --- a/ui/views/controls/button/custom_button.h +++ b/ui/views/controls/button/custom_button.h @@ -67,27 +67,27 @@ class VIEWS_EXPORT CustomButton : public Button, bool IsHotTracked() const; // Overridden from View: - virtual void OnEnabledChanged() OVERRIDE; - virtual const char* GetClassName() const OVERRIDE; - virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; - virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseCaptureLost() OVERRIDE; - virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseMoved(const ui::MouseEvent& event) OVERRIDE; - virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE; - virtual bool OnKeyReleased(const ui::KeyEvent& event) OVERRIDE; - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; - virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; + virtual void OnEnabledChanged() override; + virtual const char* GetClassName() const override; + virtual bool OnMousePressed(const ui::MouseEvent& event) override; + virtual bool OnMouseDragged(const ui::MouseEvent& event) override; + virtual void OnMouseReleased(const ui::MouseEvent& event) override; + virtual void OnMouseCaptureLost() override; + virtual void OnMouseEntered(const ui::MouseEvent& event) override; + virtual void OnMouseExited(const ui::MouseEvent& event) override; + virtual void OnMouseMoved(const ui::MouseEvent& event) override; + virtual bool OnKeyPressed(const ui::KeyEvent& event) override; + virtual bool OnKeyReleased(const ui::KeyEvent& event) override; + virtual void OnGestureEvent(ui::GestureEvent* event) override; + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) override; virtual void ShowContextMenu(const gfx::Point& p, - ui::MenuSourceType source_type) OVERRIDE; - virtual void OnDragDone() OVERRIDE; - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; - virtual void VisibilityChanged(View* starting_from, bool is_visible) OVERRIDE; + ui::MenuSourceType source_type) override; + virtual void OnDragDone() override; + virtual void GetAccessibleState(ui::AXViewState* state) override; + virtual void VisibilityChanged(View* starting_from, bool is_visible) override; // Overridden from gfx::AnimationDelegate: - virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE; + virtual void AnimationProgressed(const gfx::Animation* animation) override; // Takes ownership of the delegate. void set_state_changed_delegate(CustomButtonStateChangedDelegate* delegate) { @@ -115,8 +115,8 @@ class VIEWS_EXPORT CustomButton : public Button, // Overridden from View: virtual void ViewHierarchyChanged( - const ViewHierarchyChangedDetails& details) OVERRIDE; - virtual void OnBlur() OVERRIDE; + const ViewHierarchyChangedDetails& details) override; + virtual void OnBlur() override; // The button state (defined in implementation) ButtonState state_; diff --git a/ui/views/controls/button/image_button.h b/ui/views/controls/button/image_button.h index fbdf429..dc861c42 100644 --- a/ui/views/controls/button/image_button.h +++ b/ui/views/controls/button/image_button.h @@ -69,14 +69,14 @@ class VIEWS_EXPORT ImageButton : public CustomButton { } // Overridden from View: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual const char* GetClassName() const OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual const char* GetClassName() const override; + virtual void OnPaint(gfx::Canvas* canvas) override; protected: // Overridden from View: - virtual void OnFocus() OVERRIDE; - virtual void OnBlur() OVERRIDE; + virtual void OnFocus() override; + virtual void OnBlur() override; // Returns the image to paint. This is invoked from paint and returns a value // from images. @@ -141,14 +141,14 @@ class VIEWS_EXPORT ToggleImageButton : public ImageButton { void SetToggledTooltipText(const base::string16& tooltip); // Overridden from ImageButton: - virtual const gfx::ImageSkia& GetImage(ButtonState state) const OVERRIDE; + virtual const gfx::ImageSkia& GetImage(ButtonState state) const override; virtual void SetImage(ButtonState state, - const gfx::ImageSkia* image) OVERRIDE; + const gfx::ImageSkia* image) override; // Overridden from View: virtual bool GetTooltipText(const gfx::Point& p, - base::string16* tooltip) const OVERRIDE; - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; + base::string16* tooltip) const override; + virtual void GetAccessibleState(ui::AXViewState* state) override; private: // The parent class's images_ member is used for the current images, diff --git a/ui/views/controls/button/label_button.h b/ui/views/controls/button/label_button.h index b614fe2a..fbedf8b 100644 --- a/ui/views/controls/button/label_button.h +++ b/ui/views/controls/button/label_button.h @@ -86,11 +86,11 @@ class VIEWS_EXPORT LabelButton : public CustomButton, Painter* focus_painter() { return focus_painter_.get(); } // View: - virtual void SetBorder(scoped_ptr<Border> border) OVERRIDE; - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual int GetHeightForWidth(int w) const OVERRIDE; - virtual void Layout() OVERRIDE; - virtual const char* GetClassName() const OVERRIDE; + virtual void SetBorder(scoped_ptr<Border> border) override; + virtual gfx::Size GetPreferredSize() const override; + virtual int GetHeightForWidth(int w) const override; + virtual void Layout() override; + virtual const char* GetClassName() const override; protected: ImageView* image() const { return image_; } @@ -101,10 +101,10 @@ class VIEWS_EXPORT LabelButton : public CustomButton, virtual gfx::Rect GetChildAreaBounds(); // View: - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; - virtual void OnFocus() OVERRIDE; - virtual void OnBlur() OVERRIDE; - virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) OVERRIDE; + virtual void OnPaint(gfx::Canvas* canvas) override; + virtual void OnFocus() override; + virtual void OnBlur() override; + virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) override; // Fill |params| with information about the button. virtual void GetExtraParams(ui::NativeTheme::ExtraParams* params) const; @@ -124,7 +124,7 @@ class VIEWS_EXPORT LabelButton : public CustomButton, void UpdateThemedBorder(); // NativeThemeDelegate: - virtual gfx::Rect GetThemePaintRect() const OVERRIDE; + virtual gfx::Rect GetThemePaintRect() const override; private: FRIEND_TEST_ALL_PREFIXES(LabelButtonTest, Init); @@ -134,20 +134,20 @@ class VIEWS_EXPORT LabelButton : public CustomButton, FRIEND_TEST_ALL_PREFIXES(LabelButtonTest, FontList); // CustomButton: - virtual void StateChanged() OVERRIDE; + virtual void StateChanged() override; // View: - virtual void ChildPreferredSizeChanged(View* child) OVERRIDE; + virtual void ChildPreferredSizeChanged(View* child) override; // NativeThemeDelegate: - virtual ui::NativeTheme::Part GetThemePart() const OVERRIDE; + virtual ui::NativeTheme::Part GetThemePart() const override; virtual ui::NativeTheme::State GetThemeState( - ui::NativeTheme::ExtraParams* params) const OVERRIDE; - virtual const gfx::Animation* GetThemeAnimation() const OVERRIDE; + ui::NativeTheme::ExtraParams* params) const override; + virtual const gfx::Animation* GetThemeAnimation() const override; virtual ui::NativeTheme::State GetBackgroundThemeState( - ui::NativeTheme::ExtraParams* params) const OVERRIDE; + ui::NativeTheme::ExtraParams* params) const override; virtual ui::NativeTheme::State GetForegroundThemeState( - ui::NativeTheme::ExtraParams* params) const OVERRIDE; + ui::NativeTheme::ExtraParams* params) const override; // Resets |cached_preferred_size_| and marks |cached_preferred_size_valid_| // as false. diff --git a/ui/views/controls/button/label_button_border.h b/ui/views/controls/button/label_button_border.h index a737ba7..936c898 100644 --- a/ui/views/controls/button/label_button_border.h +++ b/ui/views/controls/button/label_button_border.h @@ -24,9 +24,9 @@ class VIEWS_EXPORT LabelButtonBorder : public Border { Button::ButtonStyle style() const { return style_; } // Overridden from Border: - virtual void Paint(const View& view, gfx::Canvas* canvas) OVERRIDE; - virtual gfx::Insets GetInsets() const OVERRIDE; - virtual gfx::Size GetMinimumSize() const OVERRIDE; + virtual void Paint(const View& view, gfx::Canvas* canvas) override; + virtual gfx::Insets GetInsets() const override; + virtual gfx::Size GetMinimumSize() const override; void set_insets(const gfx::Insets& insets) { insets_ = insets; } diff --git a/ui/views/controls/button/menu_button.h b/ui/views/controls/button/menu_button.h index 1eedc0f..a1baf05c 100644 --- a/ui/views/controls/button/menu_button.h +++ b/ui/views/controls/button/menu_button.h @@ -65,25 +65,25 @@ class VIEWS_EXPORT MenuButton : public LabelButton { virtual bool Activate(); // Overridden from View: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual const char* GetClassName() const OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; - virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseMoved(const ui::MouseEvent& event) OVERRIDE; - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; - virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE; - virtual bool OnKeyReleased(const ui::KeyEvent& event) OVERRIDE; - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual const char* GetClassName() const override; + virtual void OnPaint(gfx::Canvas* canvas) override; + virtual bool OnMousePressed(const ui::MouseEvent& event) override; + virtual void OnMouseReleased(const ui::MouseEvent& event) override; + virtual void OnMouseEntered(const ui::MouseEvent& event) override; + virtual void OnMouseExited(const ui::MouseEvent& event) override; + virtual void OnMouseMoved(const ui::MouseEvent& event) override; + virtual void OnGestureEvent(ui::GestureEvent* event) override; + virtual bool OnKeyPressed(const ui::KeyEvent& event) override; + virtual bool OnKeyReleased(const ui::KeyEvent& event) override; + virtual void GetAccessibleState(ui::AXViewState* state) override; protected: // Paint the menu marker image. void PaintMenuMarker(gfx::Canvas* canvas); // Overridden from LabelButton: - virtual gfx::Rect GetChildAreaBounds() OVERRIDE; + virtual gfx::Rect GetChildAreaBounds() override; // Offset of the associated menu position. gfx::Point menu_offset_; diff --git a/ui/views/controls/button/menu_button_unittest.cc b/ui/views/controls/button/menu_button_unittest.cc index 9cff544..3b153ad 100644 --- a/ui/views/controls/button/menu_button_unittest.cc +++ b/ui/views/controls/button/menu_button_unittest.cc @@ -19,7 +19,7 @@ class MenuButtonTest : public ViewsTestBase { MenuButtonTest() : widget_(NULL), button_(NULL) {} virtual ~MenuButtonTest() {} - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { if (widget_ && !widget_->IsClosed()) widget_->Close(); @@ -85,7 +85,7 @@ class TestButtonListener : public ButtonListener { last_event_type_(ui::ET_UNKNOWN) {} virtual ~TestButtonListener() {} - virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE { + virtual void ButtonPressed(Button* sender, const ui::Event& event) override { last_sender_ = sender; CustomButton* custom_button = CustomButton::AsCustomButton(sender); DCHECK(custom_button); @@ -111,7 +111,7 @@ class TestMenuButtonListener : public MenuButtonListener { virtual ~TestMenuButtonListener() {} virtual void OnMenuButtonClicked(View* source, - const gfx::Point& /*point*/) OVERRIDE { + const gfx::Point& /*point*/) override { last_source_ = source; CustomButton* custom_button = CustomButton::AsCustomButton(source); DCHECK(custom_button); diff --git a/ui/views/controls/button/radio_button.h b/ui/views/controls/button/radio_button.h index edbb2c6..b24e0be 100644 --- a/ui/views/controls/button/radio_button.h +++ b/ui/views/controls/button/radio_button.h @@ -21,20 +21,20 @@ class VIEWS_EXPORT RadioButton : public Checkbox { virtual ~RadioButton(); // Overridden from View: - virtual const char* GetClassName() const OVERRIDE; - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; - virtual View* GetSelectedViewForGroup(int group) OVERRIDE; - virtual bool IsGroupFocusTraversable() const OVERRIDE; - virtual void OnFocus() OVERRIDE; + virtual const char* GetClassName() const override; + virtual void GetAccessibleState(ui::AXViewState* state) override; + virtual View* GetSelectedViewForGroup(int group) override; + virtual bool IsGroupFocusTraversable() const override; + virtual void OnFocus() override; // Overridden from Button: - virtual void NotifyClick(const ui::Event& event) OVERRIDE; + virtual void NotifyClick(const ui::Event& event) override; // Overridden from LabelButton: - virtual ui::NativeTheme::Part GetThemePart() const OVERRIDE; + virtual ui::NativeTheme::Part GetThemePart() const override; // Overridden from Checkbox: - virtual void SetChecked(bool checked) OVERRIDE; + virtual void SetChecked(bool checked) override; private: DISALLOW_COPY_AND_ASSIGN(RadioButton); diff --git a/ui/views/controls/combobox/combobox.cc b/ui/views/controls/combobox/combobox.cc index 81b3ae5..62b8ec3 100644 --- a/ui/views/controls/combobox/combobox.cc +++ b/ui/views/controls/combobox/combobox.cc @@ -94,7 +94,7 @@ class TransparentButton : public CustomButton { } virtual ~TransparentButton() {} - virtual bool OnMousePressed(const ui::MouseEvent& mouse_event) OVERRIDE { + virtual bool OnMousePressed(const ui::MouseEvent& mouse_event) override { parent()->RequestFocus(); return true; } diff --git a/ui/views/controls/combobox/combobox.h b/ui/views/controls/combobox/combobox.h index 24011de..aabb476 100644 --- a/ui/views/controls/combobox/combobox.h +++ b/ui/views/controls/combobox/combobox.h @@ -93,36 +93,36 @@ class VIEWS_EXPORT Combobox : public MenuDelegate, bool invalid() const { return invalid_; } // Overridden from View: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual const char* GetClassName() const OVERRIDE; - virtual bool SkipDefaultKeyEventProcessing(const ui::KeyEvent& e) OVERRIDE; - virtual bool OnKeyPressed(const ui::KeyEvent& e) OVERRIDE; - virtual bool OnKeyReleased(const ui::KeyEvent& e) OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; - virtual void OnFocus() OVERRIDE; - virtual void OnBlur() OVERRIDE; - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; - virtual ui::TextInputClient* GetTextInputClient() OVERRIDE; - virtual void Layout() OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual const char* GetClassName() const override; + virtual bool SkipDefaultKeyEventProcessing(const ui::KeyEvent& e) override; + virtual bool OnKeyPressed(const ui::KeyEvent& e) override; + virtual bool OnKeyReleased(const ui::KeyEvent& e) override; + virtual void OnPaint(gfx::Canvas* canvas) override; + virtual void OnFocus() override; + virtual void OnBlur() override; + virtual void GetAccessibleState(ui::AXViewState* state) override; + virtual ui::TextInputClient* GetTextInputClient() override; + virtual void Layout() override; // Overridden from MenuDelegate: - virtual bool IsItemChecked(int id) const OVERRIDE; - virtual bool IsCommandEnabled(int id) const OVERRIDE; - virtual void ExecuteCommand(int id) OVERRIDE; + virtual bool IsItemChecked(int id) const override; + virtual bool IsCommandEnabled(int id) const override; + virtual void ExecuteCommand(int id) override; virtual bool GetAccelerator(int id, - ui::Accelerator* accelerator) const OVERRIDE; + ui::Accelerator* accelerator) const override; // Overridden from PrefixDelegate: - virtual int GetRowCount() OVERRIDE; - virtual int GetSelectedRow() OVERRIDE; - virtual void SetSelectedRow(int row) OVERRIDE; - virtual base::string16 GetTextForRow(int row) OVERRIDE; + virtual int GetRowCount() override; + virtual int GetSelectedRow() override; + virtual void SetSelectedRow(int row) override; + virtual base::string16 GetTextForRow(int row) override; // Overriden from ComboboxModelObserver: - virtual void OnComboboxModelChanged(ui::ComboboxModel* model) OVERRIDE; + virtual void OnComboboxModelChanged(ui::ComboboxModel* model) override; // Overriden from ButtonListener: - virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; + virtual void ButtonPressed(Button* sender, const ui::Event& event) override; private: FRIEND_TEST_ALL_PREFIXES(ComboboxTest, Click); diff --git a/ui/views/controls/combobox/combobox_unittest.cc b/ui/views/controls/combobox/combobox_unittest.cc index 5621525..8a2043f 100644 --- a/ui/views/controls/combobox/combobox_unittest.cc +++ b/ui/views/controls/combobox/combobox_unittest.cc @@ -40,7 +40,7 @@ class TestMenuRunnerHandler : public MenuRunnerHandler { const gfx::Rect& bounds, MenuAnchorPosition anchor, ui::MenuSourceType source_type, - int32 types) OVERRIDE { + int32 types) override { executed_ = true; return MenuRunner::NORMAL_EXIT; } @@ -60,13 +60,13 @@ class TestCombobox : public Combobox { key_handled_(false), key_received_(false) {} - virtual bool OnKeyPressed(const ui::KeyEvent& e) OVERRIDE { + virtual bool OnKeyPressed(const ui::KeyEvent& e) override { key_received_ = true; key_handled_ = Combobox::OnKeyPressed(e); return key_handled_; } - virtual bool OnKeyReleased(const ui::KeyEvent& e) OVERRIDE { + virtual bool OnKeyReleased(const ui::KeyEvent& e) override { key_received_ = true; key_handled_ = Combobox::OnKeyReleased(e); return key_handled_; @@ -95,21 +95,21 @@ class TestComboboxModel : public ui::ComboboxModel { static const int kItemCount = 10; // ui::ComboboxModel: - virtual int GetItemCount() const OVERRIDE { + virtual int GetItemCount() const override { return kItemCount; } - virtual base::string16 GetItemAt(int index) OVERRIDE { + virtual base::string16 GetItemAt(int index) override { if (IsItemSeparatorAt(index)) { NOTREACHED(); return ASCIIToUTF16("SEPARATOR"); } return ASCIIToUTF16(index % 2 == 0 ? "PEANUT BUTTER" : "JELLY"); } - virtual bool IsItemSeparatorAt(int index) OVERRIDE { + virtual bool IsItemSeparatorAt(int index) override { return separators_.find(index) != separators_.end(); } - virtual int GetDefaultIndex() const OVERRIDE { + virtual int GetDefaultIndex() const override { // Return the first index that is not a separator. for (int index = 0; index < kItemCount; ++index) { if (separators_.find(index) == separators_.end()) @@ -137,13 +137,13 @@ class VectorComboboxModel : public ui::ComboboxModel { virtual ~VectorComboboxModel() {} // ui::ComboboxModel: - virtual int GetItemCount() const OVERRIDE { + virtual int GetItemCount() const override { return (int)values_->size(); } - virtual base::string16 GetItemAt(int index) OVERRIDE { + virtual base::string16 GetItemAt(int index) override { return ASCIIToUTF16(values_->at(index)); } - virtual bool IsItemSeparatorAt(int index) OVERRIDE { + virtual bool IsItemSeparatorAt(int index) override { return false; } @@ -157,7 +157,7 @@ class EvilListener : public ComboboxListener { virtual ~EvilListener() {}; // ComboboxListener: - virtual void OnPerformAction(Combobox* combobox) OVERRIDE { + virtual void OnPerformAction(Combobox* combobox) override { delete combobox; deleted_ = true; } @@ -175,7 +175,7 @@ class TestComboboxListener : public views::ComboboxListener { TestComboboxListener() : perform_action_index_(-1), actions_performed_(0) {} virtual ~TestComboboxListener() {} - virtual void OnPerformAction(views::Combobox* combobox) OVERRIDE { + virtual void OnPerformAction(views::Combobox* combobox) override { perform_action_index_ = combobox->selected_index(); actions_performed_++; } @@ -206,7 +206,7 @@ class ComboboxTest : public ViewsTestBase { public: ComboboxTest() : widget_(NULL), combobox_(NULL) {} - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { if (widget_) widget_->Close(); ViewsTestBase::TearDown(); diff --git a/ui/views/controls/focusable_border.h b/ui/views/controls/focusable_border.h index b8f9aa7..9afa6ea 100644 --- a/ui/views/controls/focusable_border.h +++ b/ui/views/controls/focusable_border.h @@ -32,9 +32,9 @@ class VIEWS_EXPORT FocusableBorder : public Border { void UseDefaultColor(); // Overridden from Border: - virtual void Paint(const View& view, gfx::Canvas* canvas) OVERRIDE; - virtual gfx::Insets GetInsets() const OVERRIDE; - virtual gfx::Size GetMinimumSize() const OVERRIDE; + virtual void Paint(const View& view, gfx::Canvas* canvas) override; + virtual gfx::Insets GetInsets() const override; + virtual gfx::Size GetMinimumSize() const override; private: gfx::Insets insets_; diff --git a/ui/views/controls/glow_hover_controller.h b/ui/views/controls/glow_hover_controller.h index 2ac423e..59d27a7 100644 --- a/ui/views/controls/glow_hover_controller.h +++ b/ui/views/controls/glow_hover_controller.h @@ -65,8 +65,8 @@ class VIEWS_EXPORT GlowHoverController : public gfx::AnimationDelegate { void Draw(gfx::Canvas* canvas, const gfx::ImageSkia& mask_image) const; // gfx::AnimationDelegate overrides: - virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE; - virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE; + virtual void AnimationEnded(const gfx::Animation* animation) override; + virtual void AnimationProgressed(const gfx::Animation* animation) override; private: // View we're drawing to. diff --git a/ui/views/controls/image_view.h b/ui/views/controls/image_view.h index a05b106..00b8209 100644 --- a/ui/views/controls/image_view.h +++ b/ui/views/controls/image_view.h @@ -80,14 +80,14 @@ class VIEWS_EXPORT ImageView : public View { void SetFocusPainter(scoped_ptr<Painter> focus_painter); // Overriden from View: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual void OnFocus() OVERRIDE; - virtual void OnBlur() OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual void OnFocus() override; + virtual void OnBlur() override; + virtual void OnPaint(gfx::Canvas* canvas) override; + virtual void GetAccessibleState(ui::AXViewState* state) override; virtual bool GetTooltipText(const gfx::Point& p, - base::string16* tooltip) const OVERRIDE; - virtual bool CanProcessEventsWithinSubtree() const OVERRIDE; + base::string16* tooltip) const override; + virtual bool CanProcessEventsWithinSubtree() const override; private: void OnPaintImage(gfx::Canvas* canvas); diff --git a/ui/views/controls/label.h b/ui/views/controls/label.h index 755ca14..727b6db 100644 --- a/ui/views/controls/label.h +++ b/ui/views/controls/label.h @@ -120,17 +120,17 @@ class VIEWS_EXPORT Label : public View { const base::string16& GetLayoutTextForTesting() const; // View: - virtual gfx::Insets GetInsets() const OVERRIDE; - virtual int GetBaseline() const OVERRIDE; - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual gfx::Size GetMinimumSize() const OVERRIDE; - virtual int GetHeightForWidth(int w) const OVERRIDE; - virtual const char* GetClassName() const OVERRIDE; - virtual View* GetTooltipHandlerForPoint(const gfx::Point& point) OVERRIDE; - virtual bool CanProcessEventsWithinSubtree() const OVERRIDE; - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; + virtual gfx::Insets GetInsets() const override; + virtual int GetBaseline() const override; + virtual gfx::Size GetPreferredSize() const override; + virtual gfx::Size GetMinimumSize() const override; + virtual int GetHeightForWidth(int w) const override; + virtual const char* GetClassName() const override; + virtual View* GetTooltipHandlerForPoint(const gfx::Point& point) override; + virtual bool CanProcessEventsWithinSubtree() const override; + virtual void GetAccessibleState(ui::AXViewState* state) override; virtual bool GetTooltipText(const gfx::Point& p, - base::string16* tooltip) const OVERRIDE; + base::string16* tooltip) const override; protected: // Called by Paint to paint the text. @@ -144,9 +144,9 @@ class VIEWS_EXPORT Label : public View { SkColor disabled_color() const { return actual_disabled_color_; } // View: - virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; - virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) OVERRIDE; + virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) override; + virtual void OnPaint(gfx::Canvas* canvas) override; + virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) override; private: // These tests call CalculateDrawStringParams in order to verify the diff --git a/ui/views/controls/link.h b/ui/views/controls/link.h index 4d5cf6b..951de2d 100644 --- a/ui/views/controls/link.h +++ b/ui/views/controls/link.h @@ -34,24 +34,24 @@ class VIEWS_EXPORT Link : public Label { void set_listener(LinkListener* listener) { listener_ = listener; } // Label: - virtual const char* GetClassName() const OVERRIDE; - virtual gfx::NativeCursor GetCursor(const ui::MouseEvent& event) OVERRIDE; - virtual bool CanProcessEventsWithinSubtree() const OVERRIDE; - virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; - virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseCaptureLost() OVERRIDE; - virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE; - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; + virtual const char* GetClassName() const override; + virtual gfx::NativeCursor GetCursor(const ui::MouseEvent& event) override; + virtual bool CanProcessEventsWithinSubtree() const override; + virtual bool OnMousePressed(const ui::MouseEvent& event) override; + virtual bool OnMouseDragged(const ui::MouseEvent& event) override; + virtual void OnMouseReleased(const ui::MouseEvent& event) override; + virtual void OnMouseCaptureLost() override; + virtual bool OnKeyPressed(const ui::KeyEvent& event) override; + virtual void OnGestureEvent(ui::GestureEvent* event) override; virtual bool SkipDefaultKeyEventProcessing( - const ui::KeyEvent& event) OVERRIDE; - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; - virtual void OnEnabledChanged() OVERRIDE; - virtual void OnFocus() OVERRIDE; - virtual void OnBlur() OVERRIDE; - virtual void SetFontList(const gfx::FontList& font_list) OVERRIDE; - virtual void SetText(const base::string16& text) OVERRIDE; - virtual void SetEnabledColor(SkColor color) OVERRIDE; + const ui::KeyEvent& event) override; + virtual void GetAccessibleState(ui::AXViewState* state) override; + virtual void OnEnabledChanged() override; + virtual void OnFocus() override; + virtual void OnBlur() override; + virtual void SetFontList(const gfx::FontList& font_list) override; + virtual void SetText(const base::string16& text) override; + virtual void SetEnabledColor(SkColor color) override; void SetPressedColor(SkColor color); void SetUnderline(bool underline); diff --git a/ui/views/controls/menu/display_change_listener_aura.cc b/ui/views/controls/menu/display_change_listener_aura.cc index e6df560..7bab443 100644 --- a/ui/views/controls/menu/display_change_listener_aura.cc +++ b/ui/views/controls/menu/display_change_listener_aura.cc @@ -22,8 +22,8 @@ class AuraDisplayChangeListener // aura::WindowObserver overrides: virtual void OnWindowBoundsChanged(aura::Window* window, const gfx::Rect& old_bounds, - const gfx::Rect& new_bounds) OVERRIDE; - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; + const gfx::Rect& new_bounds) override; + virtual void OnWindowDestroying(aura::Window* window) override; private: MenuRunner* menu_runner_; diff --git a/ui/views/controls/menu/menu_controller.h b/ui/views/controls/menu/menu_controller.h index a020144..6da540d 100644 --- a/ui/views/controls/menu/menu_controller.h +++ b/ui/views/controls/menu/menu_controller.h @@ -164,7 +164,7 @@ class VIEWS_EXPORT MenuController : public WidgetObserver { void UpdateSubmenuSelection(SubmenuView* source); // WidgetObserver overrides: - virtual void OnWidgetDestroying(Widget* widget) OVERRIDE; + virtual void OnWidgetDestroying(Widget* widget) override; // Only used for testing. bool IsCancelAllTimerRunningForTest(); diff --git a/ui/views/controls/menu/menu_controller_unittest.cc b/ui/views/controls/menu/menu_controller_unittest.cc index 334c431..ba4dd13 100644 --- a/ui/views/controls/menu/menu_controller_unittest.cc +++ b/ui/views/controls/menu/menu_controller_unittest.cc @@ -61,7 +61,7 @@ class TestNullTargeter : public ui::EventTargeter { virtual ~TestNullTargeter() {} virtual ui::EventTarget* FindTargetForEvent(ui::EventTarget* root, - ui::Event* event) OVERRIDE { + ui::Event* event) override { return NULL; } @@ -82,7 +82,7 @@ class TestDispatcherClient : public aura::client::DispatcherClient { virtual void PrepareNestedLoopClosures( base::MessagePumpDispatcher* dispatcher, base::Closure* run_closure, - base::Closure* quit_closure) OVERRIDE { + base::Closure* quit_closure) override { scoped_ptr<base::RunLoop> run_loop(new base::RunLoop()); *quit_closure = run_loop->QuitClosure(); *run_closure = base::Bind(&TestDispatcherClient::RunNestedDispatcher, diff --git a/ui/views/controls/menu/menu_event_dispatcher_linux.h b/ui/views/controls/menu/menu_event_dispatcher_linux.h index bdc76fd..a516d2e 100644 --- a/ui/views/controls/menu/menu_event_dispatcher_linux.h +++ b/ui/views/controls/menu/menu_event_dispatcher_linux.h @@ -20,8 +20,8 @@ class MenuEventDispatcher : public ui::PlatformEventDispatcher { private: // ui::PlatformEventDispatcher: - virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE; - virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) OVERRIDE; + virtual bool CanDispatchEvent(const ui::PlatformEvent& event) override; + virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) override; MenuController* menu_controller_; diff --git a/ui/views/controls/menu/menu_host.h b/ui/views/controls/menu/menu_host.h index a169661..31ad7de 100644 --- a/ui/views/controls/menu/menu_host.h +++ b/ui/views/controls/menu/menu_host.h @@ -56,12 +56,12 @@ class MenuHost : public Widget { private: // Overridden from Widget: - virtual internal::RootView* CreateRootView() OVERRIDE; - virtual void OnMouseCaptureLost() OVERRIDE; - virtual void OnNativeWidgetDestroyed() OVERRIDE; - virtual void OnOwnerClosing() OVERRIDE; - virtual void OnDragWillStart() OVERRIDE; - virtual void OnDragComplete() OVERRIDE; + virtual internal::RootView* CreateRootView() override; + virtual void OnMouseCaptureLost() override; + virtual void OnNativeWidgetDestroyed() override; + virtual void OnOwnerClosing() override; + virtual void OnDragWillStart() override; + virtual void OnDragComplete() override; // The view we contain. SubmenuView* submenu_; diff --git a/ui/views/controls/menu/menu_host_root_view.h b/ui/views/controls/menu/menu_host_root_view.h index 4031dec..f08c813 100644 --- a/ui/views/controls/menu/menu_host_root_view.h +++ b/ui/views/controls/menu/menu_host_root_view.h @@ -25,15 +25,15 @@ class MenuHostRootView : public internal::RootView { void ClearSubmenu() { submenu_ = NULL; } // Overridden from View: - virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; - virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseMoved(const ui::MouseEvent& event) OVERRIDE; - virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) OVERRIDE; + virtual bool OnMousePressed(const ui::MouseEvent& event) override; + virtual bool OnMouseDragged(const ui::MouseEvent& event) override; + virtual void OnMouseReleased(const ui::MouseEvent& event) override; + virtual void OnMouseMoved(const ui::MouseEvent& event) override; + virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) override; private: // ui::EventProcessor: - virtual void OnEventProcessingFinished(ui::Event* event) OVERRIDE; + virtual void OnEventProcessingFinished(ui::Event* event) override; // Returns the MenuController for this MenuHostRootView. MenuController* GetMenuController(); diff --git a/ui/views/controls/menu/menu_image_util.cc b/ui/views/controls/menu/menu_image_util.cc index c85afd7..84f33bd 100644 --- a/ui/views/controls/menu/menu_image_util.cc +++ b/ui/views/controls/menu/menu_image_util.cc @@ -42,7 +42,7 @@ class RadioButtonImageSource : public gfx::CanvasImageSource { } virtual ~RadioButtonImageSource() {} - virtual void Draw(gfx::Canvas* canvas) OVERRIDE { + virtual void Draw(gfx::Canvas* canvas) override { canvas->Translate(gfx::Vector2d(1, 1)); SkPoint gradient_points[3]; @@ -105,7 +105,7 @@ class SubmenuArrowImageSource : public gfx::CanvasImageSource { image_id_(image_id) {} virtual ~SubmenuArrowImageSource() {} - virtual void Draw(gfx::Canvas* canvas) OVERRIDE { + virtual void Draw(gfx::Canvas* canvas) override { ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); const gfx::ImageSkia* r = rb.GetImageNamed(image_id_).ToImageSkia(); canvas->Scale(-1, 1); diff --git a/ui/views/controls/menu/menu_item_view.cc b/ui/views/controls/menu/menu_item_view.cc index a47557f..6b11d3a 100644 --- a/ui/views/controls/menu/menu_item_view.cc +++ b/ui/views/controls/menu/menu_item_view.cc @@ -49,7 +49,7 @@ class EmptyMenuMenuItem : public MenuItemView { } virtual bool GetTooltipText(const gfx::Point& p, - base::string16* tooltip) const OVERRIDE { + base::string16* tooltip) const override { // Empty menu items shouldn't have a tooltip. return false; } diff --git a/ui/views/controls/menu/menu_item_view.h b/ui/views/controls/menu/menu_item_view.h index 97cf215..cc4150e 100644 --- a/ui/views/controls/menu/menu_item_view.h +++ b/ui/views/controls/menu/menu_item_view.h @@ -118,8 +118,8 @@ class VIEWS_EXPORT MenuItemView : public View { // Overridden from View: virtual bool GetTooltipText(const gfx::Point& p, - base::string16* tooltip) const OVERRIDE; - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; + base::string16* tooltip) const override; + virtual void GetAccessibleState(ui::AXViewState* state) override; // Returns the preferred height of menu items. This is only valid when the // menu is about to be shown. @@ -260,15 +260,15 @@ class VIEWS_EXPORT MenuItemView : public View { int GetCommand() const { return command_; } // Paints the menu item. - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + virtual void OnPaint(gfx::Canvas* canvas) override; // Returns the preferred size of this item. - virtual gfx::Size GetPreferredSize() const OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; // Gets the preferred height for the given |width|. This is only different // from GetPreferredSize().width() if the item has a child view with flexible // dimensions. - virtual int GetHeightForWidth(int width) const OVERRIDE; + virtual int GetHeightForWidth(int width) const override; // Return the preferred dimensions of the item in pixel. const MenuItemDimensions& GetDimensions() const; @@ -305,7 +305,7 @@ class VIEWS_EXPORT MenuItemView : public View { void ChildrenChanged(); // Sizes any child views. - virtual void Layout() OVERRIDE; + virtual void Layout() override; // Returns true if the menu has mnemonics. This only useful on the root menu // item. @@ -330,9 +330,9 @@ class VIEWS_EXPORT MenuItemView : public View { // MenuRunner owns MenuItemView and should be the only one deleting it. virtual ~MenuItemView(); - virtual void ChildPreferredSizeChanged(View* child) OVERRIDE; + virtual void ChildPreferredSizeChanged(View* child) override; - virtual const char* GetClassName() const OVERRIDE; + virtual const char* GetClassName() const override; // Returns the preferred size (and padding) of any children. virtual gfx::Size GetChildPreferredSize() const; diff --git a/ui/views/controls/menu/menu_item_view_unittest.cc b/ui/views/controls/menu/menu_item_view_unittest.cc index 23bf4e4..961d90c 100644 --- a/ui/views/controls/menu/menu_item_view_unittest.cc +++ b/ui/views/controls/menu/menu_item_view_unittest.cc @@ -19,10 +19,10 @@ class SquareView : public views::View { virtual ~SquareView() {} private: - virtual gfx::Size GetPreferredSize() const OVERRIDE { + virtual gfx::Size GetPreferredSize() const override { return gfx::Size(1, 1); } - virtual int GetHeightForWidth(int width) const OVERRIDE { + virtual int GetHeightForWidth(int width) const override { return width; } }; diff --git a/ui/views/controls/menu/menu_message_loop_aura.cc b/ui/views/controls/menu/menu_message_loop_aura.cc index 0d7e99a..a2b7651 100644 --- a/ui/views/controls/menu/menu_message_loop_aura.cc +++ b/ui/views/controls/menu/menu_message_loop_aura.cc @@ -61,16 +61,16 @@ class ActivationChangeObserverImpl // aura::client::ActivationChangeObserver: virtual void OnWindowActivated(aura::Window* gained_active, - aura::Window* lost_active) OVERRIDE { + aura::Window* lost_active) override { if (!controller_->drag_in_progress()) controller_->CancelAll(); } // aura::WindowObserver: - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE { Cleanup(); } + virtual void OnWindowDestroying(aura::Window* window) override { Cleanup(); } // ui::EventHandler: - virtual void OnCancelMode(ui::CancelModeEvent* event) OVERRIDE { + virtual void OnCancelMode(ui::CancelModeEvent* event) override { controller_->CancelAll(); } diff --git a/ui/views/controls/menu/menu_message_loop_aura.h b/ui/views/controls/menu/menu_message_loop_aura.h index 49e8a39..1e58059 100644 --- a/ui/views/controls/menu/menu_message_loop_aura.h +++ b/ui/views/controls/menu/menu_message_loop_aura.h @@ -28,13 +28,13 @@ class MenuMessageLoopAura : public MenuMessageLoop { // Overridden from MenuMessageLoop: virtual void Run(MenuController* controller, Widget* owner, - bool nested_menu) OVERRIDE; - virtual bool ShouldQuitNow() const OVERRIDE; - virtual void QuitNow() OVERRIDE; + bool nested_menu) override; + virtual bool ShouldQuitNow() const override; + virtual void QuitNow() override; virtual void RepostEventToWindow(const ui::LocatedEvent& event, gfx::NativeWindow window, - const gfx::Point& screen_loc) OVERRIDE; - virtual void ClearOwner() OVERRIDE; + const gfx::Point& screen_loc) override; + virtual void ClearOwner() override; private: // Owner of child windows. diff --git a/ui/views/controls/menu/menu_message_loop_mac.h b/ui/views/controls/menu/menu_message_loop_mac.h index b77d263..5508e7d 100644 --- a/ui/views/controls/menu/menu_message_loop_mac.h +++ b/ui/views/controls/menu/menu_message_loop_mac.h @@ -18,13 +18,13 @@ class MenuMessageLoopMac : public MenuMessageLoop { // Overridden from MenuMessageLoop: virtual void Run(MenuController* controller, Widget* owner, - bool nested_menu) OVERRIDE; - virtual bool ShouldQuitNow() const OVERRIDE; - virtual void QuitNow() OVERRIDE; + bool nested_menu) override; + virtual bool ShouldQuitNow() const override; + virtual void QuitNow() override; virtual void RepostEventToWindow(const ui::LocatedEvent& event, gfx::NativeWindow window, - const gfx::Point& screen_loc) OVERRIDE; - virtual void ClearOwner() OVERRIDE; + const gfx::Point& screen_loc) override; + virtual void ClearOwner() override; private: DISALLOW_COPY_AND_ASSIGN(MenuMessageLoopMac); diff --git a/ui/views/controls/menu/menu_message_pump_dispatcher_win.h b/ui/views/controls/menu/menu_message_pump_dispatcher_win.h index 31f1b36..9f84171 100644 --- a/ui/views/controls/menu/menu_message_pump_dispatcher_win.h +++ b/ui/views/controls/menu/menu_message_pump_dispatcher_win.h @@ -23,7 +23,7 @@ class MenuMessagePumpDispatcher : public base::MessagePumpDispatcher { private: // base::MessagePumpDispatcher: - virtual uint32_t Dispatch(const base::NativeEvent& event) OVERRIDE; + virtual uint32_t Dispatch(const base::NativeEvent& event) override; MenuController* menu_controller_; diff --git a/ui/views/controls/menu/menu_model_adapter.h b/ui/views/controls/menu/menu_model_adapter.h index 353d010..54ce037 100644 --- a/ui/views/controls/menu/menu_model_adapter.h +++ b/ui/views/controls/menu/menu_model_adapter.h @@ -62,20 +62,20 @@ class VIEWS_EXPORT MenuModelAdapter : public MenuDelegate { int index); // views::MenuDelegate implementation. - virtual void ExecuteCommand(int id) OVERRIDE; - virtual void ExecuteCommand(int id, int mouse_event_flags) OVERRIDE; + virtual void ExecuteCommand(int id) override; + virtual void ExecuteCommand(int id, int mouse_event_flags) override; virtual bool IsTriggerableEvent(MenuItemView* source, - const ui::Event& e) OVERRIDE; + const ui::Event& e) override; virtual bool GetAccelerator(int id, - ui::Accelerator* accelerator) const OVERRIDE; - virtual base::string16 GetLabel(int id) const OVERRIDE; - virtual const gfx::FontList* GetLabelFontList(int id) const OVERRIDE; - virtual bool IsCommandEnabled(int id) const OVERRIDE; - virtual bool IsCommandVisible(int id) const OVERRIDE; - virtual bool IsItemChecked(int id) const OVERRIDE; - virtual void SelectionChanged(MenuItemView* menu) OVERRIDE; - virtual void WillShowMenu(MenuItemView* menu) OVERRIDE; - virtual void WillHideMenu(MenuItemView* menu) OVERRIDE; + ui::Accelerator* accelerator) const override; + virtual base::string16 GetLabel(int id) const override; + virtual const gfx::FontList* GetLabelFontList(int id) const override; + virtual bool IsCommandEnabled(int id) const override; + virtual bool IsCommandVisible(int id) const override; + virtual bool IsItemChecked(int id) const override; + virtual void SelectionChanged(MenuItemView* menu) override; + virtual void WillShowMenu(MenuItemView* menu) override; + virtual void WillHideMenu(MenuItemView* menu) override; private: // Implementation of BuildMenu(). diff --git a/ui/views/controls/menu/menu_model_adapter_unittest.cc b/ui/views/controls/menu/menu_model_adapter_unittest.cc index b3c4735..b98fba0 100644 --- a/ui/views/controls/menu/menu_model_adapter_unittest.cc +++ b/ui/views/controls/menu/menu_model_adapter_unittest.cc @@ -30,95 +30,95 @@ class MenuModelBase : public ui::MenuModel { // ui::MenuModel implementation: - virtual bool HasIcons() const OVERRIDE { + virtual bool HasIcons() const override { return false; } - virtual int GetItemCount() const OVERRIDE { + virtual int GetItemCount() const override { return static_cast<int>(items_.size()); } - virtual ItemType GetTypeAt(int index) const OVERRIDE { + virtual ItemType GetTypeAt(int index) const override { return items_[index].type; } virtual ui::MenuSeparatorType GetSeparatorTypeAt( - int index) const OVERRIDE { + int index) const override { return ui::NORMAL_SEPARATOR; } - virtual int GetCommandIdAt(int index) const OVERRIDE { + virtual int GetCommandIdAt(int index) const override { return index + command_id_base_; } - virtual base::string16 GetLabelAt(int index) const OVERRIDE { + virtual base::string16 GetLabelAt(int index) const override { return items_[index].label; } - virtual bool IsItemDynamicAt(int index) const OVERRIDE { + virtual bool IsItemDynamicAt(int index) const override { return false; } - virtual const gfx::FontList* GetLabelFontListAt(int index) const OVERRIDE { + virtual const gfx::FontList* GetLabelFontListAt(int index) const override { return NULL; } virtual bool GetAcceleratorAt(int index, - ui::Accelerator* accelerator) const OVERRIDE { + ui::Accelerator* accelerator) const override { return false; } - virtual bool IsItemCheckedAt(int index) const OVERRIDE { + virtual bool IsItemCheckedAt(int index) const override { return false; } - virtual int GetGroupIdAt(int index) const OVERRIDE { + virtual int GetGroupIdAt(int index) const override { return 0; } - virtual bool GetIconAt(int index, gfx::Image* icon) OVERRIDE { + virtual bool GetIconAt(int index, gfx::Image* icon) override { return false; } virtual ui::ButtonMenuItemModel* GetButtonMenuItemAt( - int index) const OVERRIDE { + int index) const override { return NULL; } - virtual bool IsEnabledAt(int index) const OVERRIDE { + virtual bool IsEnabledAt(int index) const override { return true; } - virtual bool IsVisibleAt(int index) const OVERRIDE { + virtual bool IsVisibleAt(int index) const override { return true; } - virtual MenuModel* GetSubmenuModelAt(int index) const OVERRIDE { + virtual MenuModel* GetSubmenuModelAt(int index) const override { return items_[index].submenu; } - virtual void HighlightChangedTo(int index) OVERRIDE { + virtual void HighlightChangedTo(int index) override { } - virtual void ActivatedAt(int index) OVERRIDE { + virtual void ActivatedAt(int index) override { set_last_activation(index); } - virtual void ActivatedAt(int index, int event_flags) OVERRIDE { + virtual void ActivatedAt(int index, int event_flags) override { ActivatedAt(index); } - virtual void MenuWillShow() OVERRIDE { + virtual void MenuWillShow() override { } - virtual void MenuClosed() OVERRIDE { + virtual void MenuClosed() override { } virtual void SetMenuModelDelegate( - ui::MenuModelDelegate* delegate) OVERRIDE { + ui::MenuModelDelegate* delegate) override { } - virtual ui::MenuModelDelegate* GetMenuModelDelegate() const OVERRIDE { + virtual ui::MenuModelDelegate* GetMenuModelDelegate() const override { return NULL; } diff --git a/ui/views/controls/menu/menu_runner_cocoa_unittest.mm b/ui/views/controls/menu/menu_runner_cocoa_unittest.mm index b43c6e8..bfd5723 100644 --- a/ui/views/controls/menu/menu_runner_cocoa_unittest.mm +++ b/ui/views/controls/menu/menu_runner_cocoa_unittest.mm @@ -17,7 +17,7 @@ class MenuRunnerCocoaTest : public ViewsTestBase { MenuRunnerCocoaTest() : runner_(NULL) {} virtual ~MenuRunnerCocoaTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ViewsTestBase::SetUp(); menu_.reset(new ui::SimpleMenuModel(NULL)); @@ -27,7 +27,7 @@ class MenuRunnerCocoaTest : public ViewsTestBase { EXPECT_FALSE(runner_->IsRunning()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { if (runner_) { runner_->Release(); runner_ = NULL; diff --git a/ui/views/controls/menu/menu_runner_impl.h b/ui/views/controls/menu/menu_runner_impl.h index 9df132a7..910f4b7 100644 --- a/ui/views/controls/menu/menu_runner_impl.h +++ b/ui/views/controls/menu/menu_runner_impl.h @@ -27,19 +27,19 @@ class MenuRunnerImpl : public MenuRunnerImplInterface, public: explicit MenuRunnerImpl(MenuItemView* menu); - virtual bool IsRunning() const OVERRIDE; - virtual void Release() OVERRIDE; + virtual bool IsRunning() const override; + virtual void Release() override; virtual MenuRunner::RunResult RunMenuAt(Widget* parent, MenuButton* button, const gfx::Rect& bounds, MenuAnchorPosition anchor, - int32 run_types) OVERRIDE; - virtual void Cancel() OVERRIDE; - virtual base::TimeDelta GetClosingEventTime() const OVERRIDE; + int32 run_types) override; + virtual void Cancel() override; + virtual base::TimeDelta GetClosingEventTime() const override; // MenuControllerDelegate: - virtual void DropMenuClosed(NotifyType type, MenuItemView* menu) OVERRIDE; - virtual void SiblingMenuCreated(MenuItemView* menu) OVERRIDE; + virtual void DropMenuClosed(NotifyType type, MenuItemView* menu) override; + virtual void SiblingMenuCreated(MenuItemView* menu) override; private: virtual ~MenuRunnerImpl(); diff --git a/ui/views/controls/menu/menu_runner_impl_adapter.h b/ui/views/controls/menu/menu_runner_impl_adapter.h index 3708de2..eba68c4 100644 --- a/ui/views/controls/menu/menu_runner_impl_adapter.h +++ b/ui/views/controls/menu/menu_runner_impl_adapter.h @@ -18,15 +18,15 @@ class MenuRunnerImplAdapter : public MenuRunnerImplInterface { explicit MenuRunnerImplAdapter(ui::MenuModel* menu_model); // MenuRunnerImplInterface: - virtual bool IsRunning() const OVERRIDE; - virtual void Release() OVERRIDE; + virtual bool IsRunning() const override; + virtual void Release() override; virtual MenuRunner::RunResult RunMenuAt(Widget* parent, MenuButton* button, const gfx::Rect& bounds, MenuAnchorPosition anchor, - int32 types) OVERRIDE; - virtual void Cancel() OVERRIDE; - virtual base::TimeDelta GetClosingEventTime() const OVERRIDE; + int32 types) override; + virtual void Cancel() override; + virtual base::TimeDelta GetClosingEventTime() const override; private: virtual ~MenuRunnerImplAdapter(); diff --git a/ui/views/controls/menu/menu_runner_impl_cocoa.h b/ui/views/controls/menu/menu_runner_impl_cocoa.h index a24c081..831d322 100644 --- a/ui/views/controls/menu/menu_runner_impl_cocoa.h +++ b/ui/views/controls/menu/menu_runner_impl_cocoa.h @@ -20,15 +20,15 @@ class VIEWS_EXPORT MenuRunnerImplCocoa : public MenuRunnerImplInterface { public: explicit MenuRunnerImplCocoa(ui::MenuModel* menu); - virtual bool IsRunning() const OVERRIDE; - virtual void Release() OVERRIDE; + virtual bool IsRunning() const override; + virtual void Release() override; virtual MenuRunner::RunResult RunMenuAt(Widget* parent, MenuButton* button, const gfx::Rect& bounds, MenuAnchorPosition anchor, - int32 run_types) OVERRIDE; - virtual void Cancel() OVERRIDE; - virtual base::TimeDelta GetClosingEventTime() const OVERRIDE; + int32 run_types) override; + virtual void Cancel() override; + virtual base::TimeDelta GetClosingEventTime() const override; private: virtual ~MenuRunnerImplCocoa(); diff --git a/ui/views/controls/menu/menu_scroll_view_container.cc b/ui/views/controls/menu/menu_scroll_view_container.cc index 451bd15..2d3db741 100644 --- a/ui/views/controls/menu/menu_scroll_view_container.cc +++ b/ui/views/controls/menu/menu_scroll_view_container.cc @@ -40,37 +40,37 @@ class MenuScrollButton : public View { pref_height_(MenuItemView::pref_menu_height()) { } - virtual gfx::Size GetPreferredSize() const OVERRIDE { + virtual gfx::Size GetPreferredSize() const override { return gfx::Size( host_->GetMenuItem()->GetMenuConfig().scroll_arrow_height * 2 - 1, pref_height_); } - virtual bool CanDrop(const OSExchangeData& data) OVERRIDE { + virtual bool CanDrop(const OSExchangeData& data) override { DCHECK(host_->GetMenuItem()->GetMenuController()); return true; // Always return true so that drop events are targeted to us. } - virtual void OnDragEntered(const ui::DropTargetEvent& event) OVERRIDE { + virtual void OnDragEntered(const ui::DropTargetEvent& event) override { DCHECK(host_->GetMenuItem()->GetMenuController()); host_->GetMenuItem()->GetMenuController()->OnDragEnteredScrollButton( host_, is_up_); } - virtual int OnDragUpdated(const ui::DropTargetEvent& event) OVERRIDE { + virtual int OnDragUpdated(const ui::DropTargetEvent& event) override { return ui::DragDropTypes::DRAG_NONE; } - virtual void OnDragExited() OVERRIDE { + virtual void OnDragExited() override { DCHECK(host_->GetMenuItem()->GetMenuController()); host_->GetMenuItem()->GetMenuController()->OnDragExitedScrollButton(host_); } - virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE { + virtual int OnPerformDrop(const ui::DropTargetEvent& event) override { return ui::DragDropTypes::DRAG_NONE; } - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { + virtual void OnPaint(gfx::Canvas* canvas) override { const MenuConfig& config = host_->GetMenuItem()->GetMenuConfig(); // The background. @@ -139,7 +139,7 @@ class MenuScrollViewContainer::MenuScrollView : public View { AddChildView(child); } - virtual void ScrollRectToVisible(const gfx::Rect& rect) OVERRIDE { + virtual void ScrollRectToVisible(const gfx::Rect& rect) override { // NOTE: this assumes we only want to scroll in the y direction. // If the rect is already visible, do not scroll. diff --git a/ui/views/controls/menu/menu_scroll_view_container.h b/ui/views/controls/menu/menu_scroll_view_container.h index dc7c1ac..fb0c2ff 100644 --- a/ui/views/controls/menu/menu_scroll_view_container.h +++ b/ui/views/controls/menu/menu_scroll_view_container.h @@ -31,14 +31,14 @@ class MenuScrollViewContainer : public View { void SetBubbleArrowOffset(int offset); // View overrides. - virtual void OnPaintBackground(gfx::Canvas* canvas) OVERRIDE; - virtual void Layout() OVERRIDE; - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; + virtual void OnPaintBackground(gfx::Canvas* canvas) override; + virtual void Layout() override; + virtual gfx::Size GetPreferredSize() const override; + virtual void GetAccessibleState(ui::AXViewState* state) override; protected: // View override. - virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE; + virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) override; private: // Create the default border. diff --git a/ui/views/controls/menu/menu_separator.h b/ui/views/controls/menu/menu_separator.h index 93bf3d4..feb629a 100644 --- a/ui/views/controls/menu/menu_separator.h +++ b/ui/views/controls/menu/menu_separator.h @@ -20,8 +20,8 @@ class MenuSeparator : public View { parent_menu_item_(parent) {} // View overrides. - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; - virtual gfx::Size GetPreferredSize() const OVERRIDE; + virtual void OnPaint(gfx::Canvas* canvas) override; + virtual gfx::Size GetPreferredSize() const override; private: // Gets the bounds where the separator should be painted. diff --git a/ui/views/controls/menu/native_menu_win.h b/ui/views/controls/menu/native_menu_win.h index ce3a072..39dc37e20 100644 --- a/ui/views/controls/menu/native_menu_win.h +++ b/ui/views/controls/menu/native_menu_win.h @@ -33,15 +33,15 @@ class VIEWS_EXPORT NativeMenuWin : public MenuWrapper { virtual ~NativeMenuWin(); // Overridden from MenuWrapper: - virtual void RunMenuAt(const gfx::Point& point, int alignment) OVERRIDE; - virtual void CancelMenu() OVERRIDE; - virtual void Rebuild(MenuInsertionDelegateWin* delegate) OVERRIDE; - virtual void UpdateStates() OVERRIDE; - virtual HMENU GetNativeMenu() const OVERRIDE; - virtual MenuAction GetMenuAction() const OVERRIDE; - virtual void AddMenuListener(MenuListener* listener) OVERRIDE; - virtual void RemoveMenuListener(MenuListener* listener) OVERRIDE; - virtual void SetMinimumWidth(int width) OVERRIDE; + virtual void RunMenuAt(const gfx::Point& point, int alignment) override; + virtual void CancelMenu() override; + virtual void Rebuild(MenuInsertionDelegateWin* delegate) override; + virtual void UpdateStates() override; + virtual HMENU GetNativeMenu() const override; + virtual MenuAction GetMenuAction() const override; + virtual void AddMenuListener(MenuListener* listener) override; + virtual void RemoveMenuListener(MenuListener* listener) override; + virtual void SetMinimumWidth(int width) override; private: // IMPORTANT: Note about indices. diff --git a/ui/views/controls/menu/submenu_view.h b/ui/views/controls/menu/submenu_view.h index 1b7d362..c475988 100644 --- a/ui/views/controls/menu/submenu_view.h +++ b/ui/views/controls/menu/submenu_view.h @@ -54,40 +54,40 @@ class VIEWS_EXPORT SubmenuView : public PrefixDelegate, // Positions and sizes the child views. This tiles the views vertically, // giving each child the available width. - virtual void Layout() OVERRIDE; - virtual gfx::Size GetPreferredSize() const OVERRIDE; + virtual void Layout() override; + virtual gfx::Size GetPreferredSize() const override; // Override from View. - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; - virtual ui::TextInputClient* GetTextInputClient() OVERRIDE; + virtual void GetAccessibleState(ui::AXViewState* state) override; + virtual ui::TextInputClient* GetTextInputClient() override; // Painting. virtual void PaintChildren(gfx::Canvas* canvas, - const views::CullSet& cull_view) OVERRIDE; + const views::CullSet& cull_view) override; // Drag and drop methods. These are forwarded to the MenuController. virtual bool GetDropFormats( int* formats, - std::set<OSExchangeData::CustomFormat>* custom_formats) OVERRIDE; - virtual bool AreDropTypesRequired() OVERRIDE; - virtual bool CanDrop(const OSExchangeData& data) OVERRIDE; - virtual void OnDragEntered(const ui::DropTargetEvent& event) OVERRIDE; - virtual int OnDragUpdated(const ui::DropTargetEvent& event) OVERRIDE; - virtual void OnDragExited() OVERRIDE; - virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE; + std::set<OSExchangeData::CustomFormat>* custom_formats) override; + virtual bool AreDropTypesRequired() override; + virtual bool CanDrop(const OSExchangeData& data) override; + virtual void OnDragEntered(const ui::DropTargetEvent& event) override; + virtual int OnDragUpdated(const ui::DropTargetEvent& event) override; + virtual void OnDragExited() override; + virtual int OnPerformDrop(const ui::DropTargetEvent& event) override; // Scrolls on menu item boundaries. - virtual bool OnMouseWheel(const ui::MouseWheelEvent& e) OVERRIDE; + virtual bool OnMouseWheel(const ui::MouseWheelEvent& e) override; // Overridden from ui::EventHandler. // Scrolls on menu item boundaries. - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; + virtual void OnGestureEvent(ui::GestureEvent* event) override; // Overridden from PrefixDelegate. - virtual int GetRowCount() OVERRIDE; - virtual int GetSelectedRow() OVERRIDE; - virtual void SetSelectedRow(int row) OVERRIDE; - virtual base::string16 GetTextForRow(int row) OVERRIDE; + virtual int GetRowCount() override; + virtual int GetSelectedRow() override; + virtual void SetSelectedRow(int row) override; + virtual base::string16 GetTextForRow(int row) override; // Returns true if the menu is showing. bool IsShowing(); @@ -118,7 +118,7 @@ class VIEWS_EXPORT SubmenuView : public PrefixDelegate, void ReleaseCapture(); // Overriden from View to prevent tab from doing anything. - virtual bool SkipDefaultKeyEventProcessing(const ui::KeyEvent& e) OVERRIDE; + virtual bool SkipDefaultKeyEventProcessing(const ui::KeyEvent& e) override; // Returns the parent menu item we're showing children for. MenuItemView* GetMenuItem() const; @@ -158,13 +158,13 @@ class VIEWS_EXPORT SubmenuView : public PrefixDelegate, protected: // Overridden from View: - virtual const char* GetClassName() const OVERRIDE; + virtual const char* GetClassName() const override; // View method. Overridden to schedule a paint. We do this so that when // scrolling occurs, everything is repainted correctly. - virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE; + virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) override; - virtual void ChildPreferredSizeChanged(View* child) OVERRIDE; + virtual void ChildPreferredSizeChanged(View* child) override; private: // Paints the drop indicator. This is only invoked if item is non-NULL and @@ -181,7 +181,7 @@ class VIEWS_EXPORT SubmenuView : public PrefixDelegate, MenuDelegate::DropPosition position); // Implementation of ScrollDelegate - virtual bool OnScroll(float dx, float dy) OVERRIDE; + virtual bool OnScroll(float dx, float dy) override; // Parent menu item. MenuItemView* parent_menu_item_; diff --git a/ui/views/controls/message_box_view.h b/ui/views/controls/message_box_view.h index b56b3d1..9123995 100644 --- a/ui/views/controls/message_box_view.h +++ b/ui/views/controls/message_box_view.h @@ -74,14 +74,14 @@ class VIEWS_EXPORT MessageBoxView : public View { void SetLink(const base::string16& text, LinkListener* listener); // View: - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; + virtual void GetAccessibleState(ui::AXViewState* state) override; protected: // View: virtual void ViewHierarchyChanged( - const ViewHierarchyChangedDetails& details) OVERRIDE; + const ViewHierarchyChangedDetails& details) override; // Handles Ctrl-C and writes the message in the system clipboard. - virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) override; private: // Sets up the layout manager and initializes the message labels and prompt diff --git a/ui/views/controls/native/native_view_host.h b/ui/views/controls/native/native_view_host.h index 6c1890b..db8d7bb 100644 --- a/ui/views/controls/native/native_view_host.h +++ b/ui/views/controls/native/native_view_host.h @@ -79,20 +79,20 @@ class VIEWS_EXPORT NativeViewHost : public View { void NativeViewDestroyed(); // Overridden from View: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual void Layout() OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; - virtual void VisibilityChanged(View* starting_from, bool is_visible) OVERRIDE; - virtual void OnFocus() OVERRIDE; - virtual gfx::NativeViewAccessible GetNativeViewAccessible() OVERRIDE; - virtual gfx::NativeCursor GetCursor(const ui::MouseEvent& event) OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual void Layout() override; + virtual void OnPaint(gfx::Canvas* canvas) override; + virtual void VisibilityChanged(View* starting_from, bool is_visible) override; + virtual void OnFocus() override; + virtual gfx::NativeViewAccessible GetNativeViewAccessible() override; + virtual gfx::NativeCursor GetCursor(const ui::MouseEvent& event) override; protected: - virtual bool GetNeedsNotificationWhenVisibleBoundsChange() const OVERRIDE; - virtual void OnVisibleBoundsChanged() OVERRIDE; + virtual bool GetNeedsNotificationWhenVisibleBoundsChange() const override; + virtual void OnVisibleBoundsChanged() override; virtual void ViewHierarchyChanged( - const ViewHierarchyChangedDetails& details) OVERRIDE; - virtual const char* GetClassName() const OVERRIDE; + const ViewHierarchyChangedDetails& details) override; + virtual const char* GetClassName() const override; private: friend class test::NativeViewHostTestBase; diff --git a/ui/views/controls/native/native_view_host_aura.cc b/ui/views/controls/native/native_view_host_aura.cc index 3b36b98..75c281f 100644 --- a/ui/views/controls/native/native_view_host_aura.cc +++ b/ui/views/controls/native/native_view_host_aura.cc @@ -26,20 +26,20 @@ class NativeViewHostAura::ClippingWindowDelegate : public aura::WindowDelegate { native_view_ = native_view; } - virtual gfx::Size GetMinimumSize() const OVERRIDE { return gfx::Size(); } - virtual gfx::Size GetMaximumSize() const OVERRIDE { return gfx::Size(); } + virtual gfx::Size GetMinimumSize() const override { return gfx::Size(); } + virtual gfx::Size GetMaximumSize() const override { return gfx::Size(); } virtual void OnBoundsChanged(const gfx::Rect& old_bounds, - const gfx::Rect& new_bounds) OVERRIDE {} - virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE { + const gfx::Rect& new_bounds) override {} + virtual gfx::NativeCursor GetCursor(const gfx::Point& point) override { return gfx::kNullCursor; } - virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE { + virtual int GetNonClientComponent(const gfx::Point& point) const override { return HTCLIENT; } virtual bool ShouldDescendIntoChildForEventHandling( aura::Window* child, - const gfx::Point& location) OVERRIDE { return true; } - virtual bool CanFocus() OVERRIDE { + const gfx::Point& location) override { return true; } + virtual bool CanFocus() override { // Ask the hosted native view's delegate because directly calling // aura::Window::CanFocus() will call back into this when checking whether // parents can focus. @@ -47,14 +47,14 @@ class NativeViewHostAura::ClippingWindowDelegate : public aura::WindowDelegate { ? native_view_->delegate()->CanFocus() : true; } - virtual void OnCaptureLost() OVERRIDE {} - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {} - virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE {} - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE {} - virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE {} - virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE {} - virtual bool HasHitTestMask() const OVERRIDE { return false; } - virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE {} + virtual void OnCaptureLost() override {} + virtual void OnPaint(gfx::Canvas* canvas) override {} + virtual void OnDeviceScaleFactorChanged(float device_scale_factor) override {} + virtual void OnWindowDestroying(aura::Window* window) override {} + virtual void OnWindowDestroyed(aura::Window* window) override {} + virtual void OnWindowTargetVisibilityChanged(bool visible) override {} + virtual bool HasHitTestMask() const override { return false; } + virtual void GetHitTestMask(gfx::Path* mask) const override {} private: aura::Window* native_view_; diff --git a/ui/views/controls/native/native_view_host_aura.h b/ui/views/controls/native/native_view_host_aura.h index 05c03d5..149bb41 100644 --- a/ui/views/controls/native/native_view_host_aura.h +++ b/ui/views/controls/native/native_view_host_aura.h @@ -24,18 +24,18 @@ class VIEWS_EXPORT NativeViewHostAura : public NativeViewHostWrapper, virtual ~NativeViewHostAura(); // Overridden from NativeViewHostWrapper: - virtual void AttachNativeView() OVERRIDE; - virtual void NativeViewDetaching(bool destroyed) OVERRIDE; - virtual void AddedToWidget() OVERRIDE; - virtual void RemovedFromWidget() OVERRIDE; - virtual void InstallClip(int x, int y, int w, int h) OVERRIDE; - virtual bool HasInstalledClip() OVERRIDE; - virtual void UninstallClip() OVERRIDE; - virtual void ShowWidget(int x, int y, int w, int h) OVERRIDE; - virtual void HideWidget() OVERRIDE; - virtual void SetFocus() OVERRIDE; - virtual gfx::NativeViewAccessible GetNativeViewAccessible() OVERRIDE; - virtual gfx::NativeCursor GetCursor(int x, int y) OVERRIDE; + virtual void AttachNativeView() override; + virtual void NativeViewDetaching(bool destroyed) override; + virtual void AddedToWidget() override; + virtual void RemovedFromWidget() override; + virtual void InstallClip(int x, int y, int w, int h) override; + virtual bool HasInstalledClip() override; + virtual void UninstallClip() override; + virtual void ShowWidget(int x, int y, int w, int h) override; + virtual void HideWidget() override; + virtual void SetFocus() override; + virtual gfx::NativeViewAccessible GetNativeViewAccessible() override; + virtual gfx::NativeCursor GetCursor(int x, int y) override; private: friend class NativeViewHostAuraTest; @@ -43,8 +43,8 @@ class VIEWS_EXPORT NativeViewHostAura : public NativeViewHostWrapper, class ClippingWindowDelegate; // Overridden from aura::WindowObserver: - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; - virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; + virtual void OnWindowDestroying(aura::Window* window) override; + virtual void OnWindowDestroyed(aura::Window* window) override; // Reparents the native view with the clipping window existing between it and // its old parent, so that the fast resize path works. diff --git a/ui/views/controls/native/native_view_host_aura_unittest.cc b/ui/views/controls/native/native_view_host_aura_unittest.cc index 27ce142..1a40ab7 100644 --- a/ui/views/controls/native/native_view_host_aura_unittest.cc +++ b/ui/views/controls/native/native_view_host_aura_unittest.cc @@ -45,7 +45,7 @@ class NativeViewHostWindowObserver : public aura::WindowObserver { // aura::WindowObserver overrides virtual void OnWindowVisibilityChanged(aura::Window* window, - bool visible) OVERRIDE { + bool visible) override { EventDetails event; event.type = visible ? EVENT_SHOWN : EVENT_HIDDEN; event.window = window; @@ -59,7 +59,7 @@ class NativeViewHostWindowObserver : public aura::WindowObserver { virtual void OnWindowBoundsChanged(aura::Window* window, const gfx::Rect& old_bounds, - const gfx::Rect& new_bounds) OVERRIDE { + const gfx::Rect& new_bounds) override { EventDetails event; event.type = EVENT_BOUNDS_CHANGED; event.window = window; diff --git a/ui/views/controls/native/native_view_host_mac.h b/ui/views/controls/native/native_view_host_mac.h index c15ce44..6880170 100644 --- a/ui/views/controls/native/native_view_host_mac.h +++ b/ui/views/controls/native/native_view_host_mac.h @@ -20,18 +20,18 @@ class VIEWS_EXPORT NativeViewHostMac : public NativeViewHostWrapper { virtual ~NativeViewHostMac(); // Overridden from NativeViewHostWrapper: - virtual void AttachNativeView() OVERRIDE; - virtual void NativeViewDetaching(bool destroyed) OVERRIDE; - virtual void AddedToWidget() OVERRIDE; - virtual void RemovedFromWidget() OVERRIDE; - virtual void InstallClip(int x, int y, int w, int h) OVERRIDE; - virtual bool HasInstalledClip() OVERRIDE; - virtual void UninstallClip() OVERRIDE; - virtual void ShowWidget(int x, int y, int w, int h) OVERRIDE; - virtual void HideWidget() OVERRIDE; - virtual void SetFocus() OVERRIDE; - virtual gfx::NativeViewAccessible GetNativeViewAccessible() OVERRIDE; - virtual gfx::NativeCursor GetCursor(int x, int y) OVERRIDE; + virtual void AttachNativeView() override; + virtual void NativeViewDetaching(bool destroyed) override; + virtual void AddedToWidget() override; + virtual void RemovedFromWidget() override; + virtual void InstallClip(int x, int y, int w, int h) override; + virtual bool HasInstalledClip() override; + virtual void UninstallClip() override; + virtual void ShowWidget(int x, int y, int w, int h) override; + virtual void HideWidget() override; + virtual void SetFocus() override; + virtual gfx::NativeViewAccessible GetNativeViewAccessible() override; + virtual gfx::NativeCursor GetCursor(int x, int y) override; private: // Our associated NativeViewHost. Owns this. diff --git a/ui/views/controls/native/native_view_host_unittest.cc b/ui/views/controls/native/native_view_host_unittest.cc index 4fa9a753..d5fb543 100644 --- a/ui/views/controls/native/native_view_host_unittest.cc +++ b/ui/views/controls/native/native_view_host_unittest.cc @@ -18,7 +18,7 @@ class NativeViewHostTest : public test::NativeViewHostTestBase { NativeViewHostTest() { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ViewsTestBase::SetUp(); CreateTopLevel(); } @@ -43,7 +43,7 @@ class NativeViewHierarchyChangedTestView : public View { int notification_count() const { return notification_count_; } // Overriden from View: - virtual void NativeViewHierarchyChanged() OVERRIDE { + virtual void NativeViewHierarchyChanged() override { ++notification_count_; View::NativeViewHierarchyChanged(); } @@ -74,7 +74,7 @@ class ViewHierarchyChangedTestHost : public NativeViewHost { // Overriden from NativeViewHost: virtual void ViewHierarchyChanged( - const ViewHierarchyChangedDetails& details) OVERRIDE { + const ViewHierarchyChangedDetails& details) override { gfx::NativeView parent_before = native_view() ? GetNativeParent(native_view()) : NULL; NativeViewHost::ViewHierarchyChanged(details); diff --git a/ui/views/controls/prefix_selector.h b/ui/views/controls/prefix_selector.h index 255046f..615f239 100644 --- a/ui/views/controls/prefix_selector.h +++ b/ui/views/controls/prefix_selector.h @@ -26,37 +26,37 @@ class VIEWS_EXPORT PrefixSelector : public ui::TextInputClient { // ui::TextInputClient: virtual void SetCompositionText( - const ui::CompositionText& composition) OVERRIDE; - virtual void ConfirmCompositionText() OVERRIDE; - virtual void ClearCompositionText() OVERRIDE; - virtual void InsertText(const base::string16& text) OVERRIDE; - virtual void InsertChar(base::char16 ch, int flags) OVERRIDE; - virtual gfx::NativeWindow GetAttachedWindow() const OVERRIDE; - virtual ui::TextInputType GetTextInputType() const OVERRIDE; - virtual ui::TextInputMode GetTextInputMode() const OVERRIDE; - virtual bool CanComposeInline() const OVERRIDE; - virtual gfx::Rect GetCaretBounds() const OVERRIDE; + const ui::CompositionText& composition) override; + virtual void ConfirmCompositionText() override; + virtual void ClearCompositionText() override; + virtual void InsertText(const base::string16& text) override; + virtual void InsertChar(base::char16 ch, int flags) override; + virtual gfx::NativeWindow GetAttachedWindow() const override; + virtual ui::TextInputType GetTextInputType() const override; + virtual ui::TextInputMode GetTextInputMode() const override; + virtual bool CanComposeInline() const override; + virtual gfx::Rect GetCaretBounds() const override; virtual bool GetCompositionCharacterBounds(uint32 index, - gfx::Rect* rect) const OVERRIDE; - virtual bool HasCompositionText() const OVERRIDE; - virtual bool GetTextRange(gfx::Range* range) const OVERRIDE; - virtual bool GetCompositionTextRange(gfx::Range* range) const OVERRIDE; - virtual bool GetSelectionRange(gfx::Range* range) const OVERRIDE; - virtual bool SetSelectionRange(const gfx::Range& range) OVERRIDE; - virtual bool DeleteRange(const gfx::Range& range) OVERRIDE; + gfx::Rect* rect) const override; + virtual bool HasCompositionText() const override; + virtual bool GetTextRange(gfx::Range* range) const override; + virtual bool GetCompositionTextRange(gfx::Range* range) const override; + virtual bool GetSelectionRange(gfx::Range* range) const override; + virtual bool SetSelectionRange(const gfx::Range& range) override; + virtual bool DeleteRange(const gfx::Range& range) override; virtual bool GetTextFromRange(const gfx::Range& range, - base::string16* text) const OVERRIDE; - virtual void OnInputMethodChanged() OVERRIDE; + base::string16* text) const override; + virtual void OnInputMethodChanged() override; virtual bool ChangeTextDirectionAndLayoutAlignment( - base::i18n::TextDirection direction) OVERRIDE; - virtual void ExtendSelectionAndDelete(size_t before, size_t after) OVERRIDE; - virtual void EnsureCaretInRect(const gfx::Rect& rect) OVERRIDE; - virtual void OnCandidateWindowShown() OVERRIDE; - virtual void OnCandidateWindowUpdated() OVERRIDE; - virtual void OnCandidateWindowHidden() OVERRIDE; - - virtual bool IsEditingCommandEnabled(int command_id) OVERRIDE; - virtual void ExecuteEditingCommand(int command_id) OVERRIDE; + base::i18n::TextDirection direction) override; + virtual void ExtendSelectionAndDelete(size_t before, size_t after) override; + virtual void EnsureCaretInRect(const gfx::Rect& rect) override; + virtual void OnCandidateWindowShown() override; + virtual void OnCandidateWindowUpdated() override; + virtual void OnCandidateWindowHidden() override; + + virtual bool IsEditingCommandEnabled(int command_id) override; + virtual void ExecuteEditingCommand(int command_id) override; private: // Invoked when text is typed. Tries to change the selection appropriately. diff --git a/ui/views/controls/prefix_selector_unittest.cc b/ui/views/controls/prefix_selector_unittest.cc index 031c007..ce04180 100644 --- a/ui/views/controls/prefix_selector_unittest.cc +++ b/ui/views/controls/prefix_selector_unittest.cc @@ -26,19 +26,19 @@ class TestPrefixDelegate : public PrefixDelegate { virtual ~TestPrefixDelegate() {} - virtual int GetRowCount() OVERRIDE { + virtual int GetRowCount() override { return static_cast<int>(rows_.size()); } - virtual int GetSelectedRow() OVERRIDE { + virtual int GetSelectedRow() override { return selected_row_; } - virtual void SetSelectedRow(int row) OVERRIDE { + virtual void SetSelectedRow(int row) override { selected_row_ = row; } - virtual base::string16 GetTextForRow(int row) OVERRIDE { + virtual base::string16 GetTextForRow(int row) override { return rows_[row]; } diff --git a/ui/views/controls/progress_bar.h b/ui/views/controls/progress_bar.h index b6d3851..e844d2f 100644 --- a/ui/views/controls/progress_bar.h +++ b/ui/views/controls/progress_bar.h @@ -39,16 +39,16 @@ class VIEWS_EXPORT ProgressBar : public View { // Overridden from View: virtual bool GetTooltipText(const gfx::Point& p, - base::string16* tooltip) const OVERRIDE; - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; + base::string16* tooltip) const override; + virtual void GetAccessibleState(ui::AXViewState* state) override; private: static const char kViewClassName[]; // Overridden from View: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual const char* GetClassName() const OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual const char* GetClassName() const override; + virtual void OnPaint(gfx::Canvas* canvas) override; // Inclusive range used when displaying values. double min_display_value_; diff --git a/ui/views/controls/resize_area.h b/ui/views/controls/resize_area.h index 12ec310..661c2b6 100644 --- a/ui/views/controls/resize_area.h +++ b/ui/views/controls/resize_area.h @@ -26,13 +26,13 @@ class VIEWS_EXPORT ResizeArea : public View { virtual ~ResizeArea(); // Overridden from views::View: - virtual const char* GetClassName() const OVERRIDE; - virtual gfx::NativeCursor GetCursor(const ui::MouseEvent& event) OVERRIDE; - virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; - virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseCaptureLost() OVERRIDE; - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; + virtual const char* GetClassName() const override; + virtual gfx::NativeCursor GetCursor(const ui::MouseEvent& event) override; + virtual bool OnMousePressed(const ui::MouseEvent& event) override; + virtual bool OnMouseDragged(const ui::MouseEvent& event) override; + virtual void OnMouseReleased(const ui::MouseEvent& event) override; + virtual void OnMouseCaptureLost() override; + virtual void GetAccessibleState(ui::AXViewState* state) override; private: // Report the amount the user resized by to the delegate, accounting for diff --git a/ui/views/controls/scroll_view.cc b/ui/views/controls/scroll_view.cc index d12c73b..8a05f92 100644 --- a/ui/views/controls/scroll_view.cc +++ b/ui/views/controls/scroll_view.cc @@ -24,7 +24,7 @@ class ScrollViewWithBorder : public views::ScrollView { ScrollViewWithBorder() {} // View overrides; - virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) OVERRIDE { + virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) override { SetBorder(Border::CreateSolidBorder( 1, theme->GetSystemColor(ui::NativeTheme::kColorId_UnfocusedBorderColor))); @@ -38,7 +38,7 @@ class ScrollCornerView : public views::View { public: ScrollCornerView() {} - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { + virtual void OnPaint(gfx::Canvas* canvas) override { ui::NativeTheme::ExtraParams ignored; GetNativeTheme()->Paint(canvas->sk_canvas(), ui::NativeTheme::kScrollbarCorner, @@ -96,11 +96,11 @@ class ScrollView::Viewport : public View { Viewport() {} virtual ~Viewport() {} - virtual const char* GetClassName() const OVERRIDE { + virtual const char* GetClassName() const override { return "ScrollView::Viewport"; } - virtual void ScrollRectToVisible(const gfx::Rect& rect) OVERRIDE { + virtual void ScrollRectToVisible(const gfx::Rect& rect) override { if (!has_children() || !parent()) return; @@ -111,7 +111,7 @@ class ScrollView::Viewport : public View { scroll_rect); } - virtual void ChildPreferredSizeChanged(View* child) OVERRIDE { + virtual void ChildPreferredSizeChanged(View* child) override { if (parent()) parent()->Layout(); } diff --git a/ui/views/controls/scroll_view.h b/ui/views/controls/scroll_view.h index f6e8564..4dfcdfc 100644 --- a/ui/views/controls/scroll_view.h +++ b/ui/views/controls/scroll_view.h @@ -75,21 +75,21 @@ class VIEWS_EXPORT ScrollView : public View, public ScrollBarController { void SetVerticalScrollBar(ScrollBar* vert_sb); // View overrides: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual int GetHeightForWidth(int width) const OVERRIDE; - virtual void Layout() OVERRIDE; - virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE; - virtual bool OnMouseWheel(const ui::MouseWheelEvent& e) OVERRIDE; - virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE; - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; - virtual const char* GetClassName() const OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual int GetHeightForWidth(int width) const override; + virtual void Layout() override; + virtual bool OnKeyPressed(const ui::KeyEvent& event) override; + virtual bool OnMouseWheel(const ui::MouseWheelEvent& e) override; + virtual void OnMouseEntered(const ui::MouseEvent& event) override; + virtual void OnMouseExited(const ui::MouseEvent& event) override; + virtual void OnGestureEvent(ui::GestureEvent* event) override; + virtual const char* GetClassName() const override; // ScrollBarController overrides: - virtual void ScrollToPosition(ScrollBar* source, int position) OVERRIDE; + virtual void ScrollToPosition(ScrollBar* source, int position) override; virtual int GetScrollIncrement(ScrollBar* source, bool is_page, - bool is_positive) OVERRIDE; + bool is_positive) override; private: FRIEND_TEST_ALL_PREFIXES(ScrollViewTest, CornerViewVisibility); @@ -211,7 +211,7 @@ class FixedRowHeightScrollHelper : public VariableRowHeightScrollHelper { protected: // Calculates the bounds of the row from the top margin and row height. - virtual RowInfo GetRowInfo(int y) OVERRIDE; + virtual RowInfo GetRowInfo(int y) override; private: int top_margin_; diff --git a/ui/views/controls/scroll_view_unittest.cc b/ui/views/controls/scroll_view_unittest.cc index a2cba6f..9baa4d3 100644 --- a/ui/views/controls/scroll_view_unittest.cc +++ b/ui/views/controls/scroll_view_unittest.cc @@ -26,11 +26,11 @@ class CustomView : public View { PreferredSizeChanged(); } - virtual gfx::Size GetPreferredSize() const OVERRIDE { + virtual gfx::Size GetPreferredSize() const override { return preferred_size_; } - virtual void Layout() OVERRIDE { + virtual void Layout() override { gfx::Size pref = GetPreferredSize(); int width = pref.width(); int height = pref.height(); diff --git a/ui/views/controls/scrollbar/base_scroll_bar.h b/ui/views/controls/scrollbar/base_scroll_bar.h index 068ad4d..b68e22a 100644 --- a/ui/views/controls/scrollbar/base_scroll_bar.h +++ b/ui/views/controls/scrollbar/base_scroll_bar.h @@ -64,42 +64,42 @@ class VIEWS_EXPORT BaseScrollBar : public ScrollBar, CustomButton::ButtonState new_state); // View overrides: - virtual gfx::Size GetPreferredSize() const OVERRIDE = 0; - virtual void Layout() OVERRIDE = 0; - virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseCaptureLost() OVERRIDE; - virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE; - virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE; - virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) OVERRIDE; + virtual gfx::Size GetPreferredSize() const override = 0; + virtual void Layout() override = 0; + virtual bool OnMousePressed(const ui::MouseEvent& event) override; + virtual void OnMouseReleased(const ui::MouseEvent& event) override; + virtual void OnMouseCaptureLost() override; + virtual void OnMouseEntered(const ui::MouseEvent& event) override; + virtual void OnMouseExited(const ui::MouseEvent& event) override; + virtual bool OnKeyPressed(const ui::KeyEvent& event) override; + virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) override; // ui::EventHandler overrides: - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; + virtual void OnGestureEvent(ui::GestureEvent* event) override; // ScrollBar overrides: virtual void Update(int viewport_size, int content_size, - int contents_scroll_offset) OVERRIDE; - virtual int GetLayoutSize() const OVERRIDE = 0; - virtual int GetPosition() const OVERRIDE; + int contents_scroll_offset) override; + virtual int GetLayoutSize() const override = 0; + virtual int GetPosition() const override; // ScrollDelegate overrides: - virtual bool OnScroll(float dx, float dy) OVERRIDE; + virtual bool OnScroll(float dx, float dy) override; // ContextMenuController overrides: virtual void ShowContextMenuForView(View* source, const gfx::Point& point, - ui::MenuSourceType source_type) OVERRIDE; + ui::MenuSourceType source_type) override; // Menu::Delegate overrides: - virtual base::string16 GetLabel(int id) const OVERRIDE; - virtual bool IsCommandEnabled(int id) const OVERRIDE; - virtual void ExecuteCommand(int id) OVERRIDE; + virtual base::string16 GetLabel(int id) const override; + virtual bool IsCommandEnabled(int id) const override; + virtual void ExecuteCommand(int id) override; protected: // View overrides: - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE = 0; + virtual void OnPaint(gfx::Canvas* canvas) override = 0; BaseScrollBarThumb* GetThumb() const; CustomButton::ButtonState GetThumbTrackState() const; diff --git a/ui/views/controls/scrollbar/base_scroll_bar_button.h b/ui/views/controls/scrollbar/base_scroll_bar_button.h index b154d1e..b264e6d 100644 --- a/ui/views/controls/scrollbar/base_scroll_bar_button.h +++ b/ui/views/controls/scrollbar/base_scroll_bar_button.h @@ -30,9 +30,9 @@ class VIEWS_EXPORT BaseScrollBarButton : public CustomButton { virtual ~BaseScrollBarButton(); protected: - virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseCaptureLost() OVERRIDE; + virtual bool OnMousePressed(const ui::MouseEvent& event) override; + virtual void OnMouseReleased(const ui::MouseEvent& event) override; + virtual void OnMouseCaptureLost() override; private: void RepeaterNotifyClick(); diff --git a/ui/views/controls/scrollbar/base_scroll_bar_thumb.h b/ui/views/controls/scrollbar/base_scroll_bar_thumb.h index c755441..5e9dbc6 100644 --- a/ui/views/controls/scrollbar/base_scroll_bar_thumb.h +++ b/ui/views/controls/scrollbar/base_scroll_bar_thumb.h @@ -44,17 +44,17 @@ class VIEWS_EXPORT BaseScrollBarThumb : public View { int GetPosition() const; // View overrides: - virtual gfx::Size GetPreferredSize() const OVERRIDE = 0; + virtual gfx::Size GetPreferredSize() const override = 0; protected: // View overrides: - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE = 0; - virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE; - virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; - virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseCaptureLost() OVERRIDE; + virtual void OnPaint(gfx::Canvas* canvas) override = 0; + virtual void OnMouseEntered(const ui::MouseEvent& event) override; + virtual void OnMouseExited(const ui::MouseEvent& event) override; + virtual bool OnMousePressed(const ui::MouseEvent& event) override; + virtual bool OnMouseDragged(const ui::MouseEvent& event) override; + virtual void OnMouseReleased(const ui::MouseEvent& event) override; + virtual void OnMouseCaptureLost() override; CustomButton::ButtonState GetState() const; // Update our state and schedule a repaint when the mouse moves over us. diff --git a/ui/views/controls/scrollbar/kennedy_scroll_bar.cc b/ui/views/controls/scrollbar/kennedy_scroll_bar.cc index b3d1e6a..13a7823 100644 --- a/ui/views/controls/scrollbar/kennedy_scroll_bar.cc +++ b/ui/views/controls/scrollbar/kennedy_scroll_bar.cc @@ -28,8 +28,8 @@ class KennedyScrollBarThumb : public BaseScrollBarThumb { protected: // View overrides: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual void OnPaint(gfx::Canvas* canvas) override; private: DISALLOW_COPY_AND_ASSIGN(KennedyScrollBarThumb); diff --git a/ui/views/controls/scrollbar/kennedy_scroll_bar.h b/ui/views/controls/scrollbar/kennedy_scroll_bar.h index ace3fae..bd67a05 100644 --- a/ui/views/controls/scrollbar/kennedy_scroll_bar.h +++ b/ui/views/controls/scrollbar/kennedy_scroll_bar.h @@ -19,15 +19,15 @@ class VIEWS_EXPORT KennedyScrollBar : public BaseScrollBar { protected: // BaseScrollBar overrides: - virtual gfx::Rect GetTrackBounds() const OVERRIDE; + virtual gfx::Rect GetTrackBounds() const override; // ScrollBar overrides: - virtual int GetLayoutSize() const OVERRIDE; + virtual int GetLayoutSize() const override; // View overrides: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual void Layout() OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual void Layout() override; + virtual void OnPaint(gfx::Canvas* canvas) override; private: DISALLOW_COPY_AND_ASSIGN(KennedyScrollBar); diff --git a/ui/views/controls/scrollbar/native_scroll_bar.h b/ui/views/controls/scrollbar/native_scroll_bar.h index 058784d..8536111 100644 --- a/ui/views/controls/scrollbar/native_scroll_bar.h +++ b/ui/views/controls/scrollbar/native_scroll_bar.h @@ -40,25 +40,25 @@ class VIEWS_EXPORT NativeScrollBar : public ScrollBar { FRIEND_TEST_ALL_PREFIXES(NativeScrollBarTest, Scrolling); // Overridden from View. - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual void Layout() OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual void Layout() override; virtual void ViewHierarchyChanged( - const ViewHierarchyChangedDetails& details) OVERRIDE; - virtual const char* GetClassName() const OVERRIDE; + const ViewHierarchyChangedDetails& details) override; + virtual const char* GetClassName() const override; // Overrideen from View for keyboard UI purpose. - virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE; - virtual bool OnMouseWheel(const ui::MouseWheelEvent& e) OVERRIDE; + virtual bool OnKeyPressed(const ui::KeyEvent& event) override; + virtual bool OnMouseWheel(const ui::MouseWheelEvent& e) override; // Overridden from ui::EventHandler. - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; + virtual void OnGestureEvent(ui::GestureEvent* event) override; // Overridden from ScrollBar. virtual void Update(int viewport_size, int content_size, - int current_pos) OVERRIDE; - virtual int GetPosition() const OVERRIDE; - virtual int GetLayoutSize() const OVERRIDE; + int current_pos) override; + virtual int GetPosition() const override; + virtual int GetLayoutSize() const override; // init border NativeScrollBarWrapper* native_wrapper_; diff --git a/ui/views/controls/scrollbar/native_scroll_bar_views.cc b/ui/views/controls/scrollbar/native_scroll_bar_views.cc index b4f83cc..4ffa8df 100644 --- a/ui/views/controls/scrollbar/native_scroll_bar_views.cc +++ b/ui/views/controls/scrollbar/native_scroll_bar_views.cc @@ -32,13 +32,13 @@ class ScrollBarButton : public BaseScrollBarButton { ScrollBarButton(ButtonListener* listener, Type type); virtual ~ScrollBarButton(); - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual const char* GetClassName() const OVERRIDE { + virtual gfx::Size GetPreferredSize() const override; + virtual const char* GetClassName() const override { return "ScrollBarButton"; } protected: - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + virtual void OnPaint(gfx::Canvas* canvas) override; private: ui::NativeTheme::ExtraParams GetNativeThemeParams() const; @@ -54,13 +54,13 @@ class ScrollBarThumb : public BaseScrollBarThumb { explicit ScrollBarThumb(BaseScrollBar* scroll_bar); virtual ~ScrollBarThumb(); - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual const char* GetClassName() const OVERRIDE { + virtual gfx::Size GetPreferredSize() const override; + virtual const char* GetClassName() const override { return "ScrollBarThumb"; } protected: - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + virtual void OnPaint(gfx::Canvas* canvas) override; private: ui::NativeTheme::ExtraParams GetNativeThemeParams() const; diff --git a/ui/views/controls/scrollbar/native_scroll_bar_views.h b/ui/views/controls/scrollbar/native_scroll_bar_views.h index 38dbe0b..9dd6b6d 100644 --- a/ui/views/controls/scrollbar/native_scroll_bar_views.h +++ b/ui/views/controls/scrollbar/native_scroll_bar_views.h @@ -34,32 +34,32 @@ class VIEWS_EXPORT NativeScrollBarViews : public BaseScrollBar, private: // View overrides: - virtual void Layout() OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual const char* GetClassName() const OVERRIDE; + virtual void Layout() override; + virtual void OnPaint(gfx::Canvas* canvas) override; + virtual gfx::Size GetPreferredSize() const override; + virtual const char* GetClassName() const override; // ScrollBar overrides: - virtual int GetLayoutSize() const OVERRIDE; + virtual int GetLayoutSize() const override; // BaseScrollBar overrides: - virtual void ScrollToPosition(int position) OVERRIDE; - virtual int GetScrollIncrement(bool is_page, bool is_positive) OVERRIDE; + virtual void ScrollToPosition(int position) override; + virtual int GetScrollIncrement(bool is_page, bool is_positive) override; // BaseButton::ButtonListener overrides: virtual void ButtonPressed(Button* sender, - const ui::Event& event) OVERRIDE; + const ui::Event& event) override; // NativeScrollBarWrapper overrides: - virtual int GetPosition() const OVERRIDE; - virtual View* GetView() OVERRIDE; + virtual int GetPosition() const override; + virtual View* GetView() override; virtual void Update(int viewport_size, int content_size, - int current_pos) OVERRIDE; + int current_pos) override; // Returns the area for the track. This is the area of the scrollbar minus // the size of the arrow buttons. - virtual gfx::Rect GetTrackBounds() const OVERRIDE; + virtual gfx::Rect GetTrackBounds() const override; // The NativeScrollBar we are bound to. NativeScrollBar* native_scroll_bar_; diff --git a/ui/views/controls/scrollbar/overlay_scroll_bar.cc b/ui/views/controls/scrollbar/overlay_scroll_bar.cc index 1396bd1..ad54fd7 100644 --- a/ui/views/controls/scrollbar/overlay_scroll_bar.cc +++ b/ui/views/controls/scrollbar/overlay_scroll_bar.cc @@ -30,11 +30,11 @@ class OverlayScrollBarThumb : public BaseScrollBarThumb, protected: // View overrides: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual void OnPaint(gfx::Canvas* canvas) override; // gfx::AnimationDelegate overrides: - virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE; + virtual void AnimationProgressed(const gfx::Animation* animation) override; private: double animation_opacity_; diff --git a/ui/views/controls/scrollbar/overlay_scroll_bar.h b/ui/views/controls/scrollbar/overlay_scroll_bar.h index 428a277..20cb755 100644 --- a/ui/views/controls/scrollbar/overlay_scroll_bar.h +++ b/ui/views/controls/scrollbar/overlay_scroll_bar.h @@ -18,19 +18,19 @@ class VIEWS_EXPORT OverlayScrollBar : public BaseScrollBar { protected: // BaseScrollBar overrides: - virtual gfx::Rect GetTrackBounds() const OVERRIDE; - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; + virtual gfx::Rect GetTrackBounds() const override; + virtual void OnGestureEvent(ui::GestureEvent* event) override; // ScrollBar overrides: - virtual int GetLayoutSize() const OVERRIDE; - virtual int GetContentOverlapSize() const OVERRIDE; - virtual void OnMouseEnteredScrollView(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseExitedScrollView(const ui::MouseEvent& event) OVERRIDE; + virtual int GetLayoutSize() const override; + virtual int GetContentOverlapSize() const override; + virtual void OnMouseEnteredScrollView(const ui::MouseEvent& event) override; + virtual void OnMouseExitedScrollView(const ui::MouseEvent& event) override; // View overrides: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual void Layout() OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual void Layout() override; + virtual void OnPaint(gfx::Canvas* canvas) override; private: gfx::SlideAnimation animation_; diff --git a/ui/views/controls/scrollbar/scroll_bar.h b/ui/views/controls/scrollbar/scroll_bar.h index c8a31c4..2a711d6 100644 --- a/ui/views/controls/scrollbar/scroll_bar.h +++ b/ui/views/controls/scrollbar/scroll_bar.h @@ -60,7 +60,7 @@ class VIEWS_EXPORT ScrollBar : public View { virtual ~ScrollBar(); // Overridden from View: - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; + virtual void GetAccessibleState(ui::AXViewState* state) override; // Returns whether this scrollbar is horizontal. bool IsHorizontal() const; diff --git a/ui/views/controls/scrollbar/scrollbar_unittest.cc b/ui/views/controls/scrollbar/scrollbar_unittest.cc index c3c96df..295ac2c 100644 --- a/ui/views/controls/scrollbar/scrollbar_unittest.cc +++ b/ui/views/controls/scrollbar/scrollbar_unittest.cc @@ -17,14 +17,14 @@ class TestScrollBarController : public views::ScrollBarController { virtual ~TestScrollBarController() {} virtual void ScrollToPosition(views::ScrollBar* source, - int position) OVERRIDE { + int position) override { last_source = source; last_position = position; } virtual int GetScrollIncrement(views::ScrollBar* source, bool is_page, - bool is_positive) OVERRIDE { + bool is_positive) override { last_source = source; last_is_page = is_page; last_is_positive = is_positive; diff --git a/ui/views/controls/separator.h b/ui/views/controls/separator.h index 6f45f8c..7c964b7 100644 --- a/ui/views/controls/separator.h +++ b/ui/views/controls/separator.h @@ -28,11 +28,11 @@ class VIEWS_EXPORT Separator : public View { virtual ~Separator(); // Overridden from View: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual void GetAccessibleState(ui::AXViewState* state) override; virtual void Paint(gfx::Canvas* canvas, - const views::CullSet& cull_set) OVERRIDE; - virtual const char* GetClassName() const OVERRIDE; + const views::CullSet& cull_set) override; + virtual const char* GetClassName() const override; private: const Orientation orientation_; diff --git a/ui/views/controls/single_split_view.h b/ui/views/controls/single_split_view.h index c03c834..4581e40 100644 --- a/ui/views/controls/single_split_view.h +++ b/ui/views/controls/single_split_view.h @@ -31,17 +31,17 @@ class VIEWS_EXPORT SingleSplitView : public View { Orientation orientation, SingleSplitViewListener* listener); - virtual void Layout() OVERRIDE; - virtual const char* GetClassName() const OVERRIDE; + virtual void Layout() override; + virtual const char* GetClassName() const override; - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; + virtual void GetAccessibleState(ui::AXViewState* state) override; // SingleSplitView's preferred size is the sum of the preferred widths // and the max of the heights. - virtual gfx::Size GetPreferredSize() const OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; // Overriden to return a resize cursor when over the divider. - virtual gfx::NativeCursor GetCursor(const ui::MouseEvent& event) OVERRIDE; + virtual gfx::NativeCursor GetCursor(const ui::MouseEvent& event) override; Orientation orientation() const { return is_horizontal_ ? HORIZONTAL_SPLIT : VERTICAL_SPLIT; @@ -81,10 +81,10 @@ class VIEWS_EXPORT SingleSplitView : public View { protected: // View overrides. - virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; - virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseCaptureLost() OVERRIDE; - virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE; + virtual bool OnMousePressed(const ui::MouseEvent& event) override; + virtual bool OnMouseDragged(const ui::MouseEvent& event) override; + virtual void OnMouseCaptureLost() override; + virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) override; private: // This test calls OnMouse* functions. diff --git a/ui/views/controls/single_split_view_unittest.cc b/ui/views/controls/single_split_view_unittest.cc index cfea48e..ca48b9a 100644 --- a/ui/views/controls/single_split_view_unittest.cc +++ b/ui/views/controls/single_split_view_unittest.cc @@ -45,7 +45,7 @@ class SingleSplitViewListenerImpl : public views::SingleSplitViewListener { public: SingleSplitViewListenerImpl() : count_(0) {} - virtual bool SplitHandleMoved(views::SingleSplitView* sender) OVERRIDE { + virtual bool SplitHandleMoved(views::SingleSplitView* sender) override { ++count_; return false; } @@ -64,7 +64,7 @@ class MinimumSizedView: public views::View { private: gfx::Size min_size_; - virtual gfx::Size GetMinimumSize() const OVERRIDE; + virtual gfx::Size GetMinimumSize() const override; }; gfx::Size MinimumSizedView::GetMinimumSize() const { diff --git a/ui/views/controls/slide_out_view.h b/ui/views/controls/slide_out_view.h index 04a8f8a..46b4135 100644 --- a/ui/views/controls/slide_out_view.h +++ b/ui/views/controls/slide_out_view.h @@ -23,7 +23,7 @@ class VIEWS_EXPORT SlideOutView : public views::View, virtual void OnSlideOut() = 0; // Overridden from views::View. - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; + virtual void OnGestureEvent(ui::GestureEvent* event) override; private: enum SlideDirection { @@ -38,7 +38,7 @@ class VIEWS_EXPORT SlideOutView : public views::View, void SlideOutAndClose(SlideDirection direction); // Overridden from ImplicitAnimationObserver. - virtual void OnImplicitAnimationsCompleted() OVERRIDE; + virtual void OnImplicitAnimationsCompleted() override; float gesture_scroll_amount_; diff --git a/ui/views/controls/slider.h b/ui/views/controls/slider.h index 33a760b..e6a521a 100644 --- a/ui/views/controls/slider.h +++ b/ui/views/controls/slider.h @@ -94,21 +94,21 @@ class VIEWS_EXPORT Slider : public View, public gfx::AnimationDelegate { void OnSliderDragEnded(); // views::View overrides: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; - virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; - virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE; - virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE; - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; - virtual void OnFocus() OVERRIDE; - virtual void OnBlur() OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual void OnPaint(gfx::Canvas* canvas) override; + virtual bool OnMousePressed(const ui::MouseEvent& event) override; + virtual bool OnMouseDragged(const ui::MouseEvent& event) override; + virtual void OnMouseReleased(const ui::MouseEvent& event) override; + virtual bool OnKeyPressed(const ui::KeyEvent& event) override; + virtual void GetAccessibleState(ui::AXViewState* state) override; + virtual void OnFocus() override; + virtual void OnBlur() override; // ui::EventHandler overrides: - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; + virtual void OnGestureEvent(ui::GestureEvent* event) override; // gfx::AnimationDelegate overrides: - virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE; + virtual void AnimationProgressed(const gfx::Animation* animation) override; void set_listener(SliderListener* listener) { listener_ = listener; diff --git a/ui/views/controls/slider_unittest.cc b/ui/views/controls/slider_unittest.cc index efa4112..23be9e9 100644 --- a/ui/views/controls/slider_unittest.cc +++ b/ui/views/controls/slider_unittest.cc @@ -56,9 +56,9 @@ class TestSliderListener : public views::SliderListener { virtual void SliderValueChanged(views::Slider* sender, float value, float old_value, - views::SliderChangeReason reason) OVERRIDE; - virtual void SliderDragStarted(views::Slider* sender) OVERRIDE; - virtual void SliderDragEnded(views::Slider* sender) OVERRIDE; + views::SliderChangeReason reason) override; + virtual void SliderDragStarted(views::Slider* sender) override; + virtual void SliderDragEnded(views::Slider* sender) override; private: // The epoch of the last event. @@ -143,8 +143,8 @@ class SliderTest : public views::ViewsTestBase { virtual void ClickAt(int x, int y); // testing::Test: - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; ui::test::EventGenerator* event_generator() { return event_generator_.get(); diff --git a/ui/views/controls/styled_label.h b/ui/views/controls/styled_label.h index ce1004c..8382b8e 100644 --- a/ui/views/controls/styled_label.h +++ b/ui/views/controls/styled_label.h @@ -91,13 +91,13 @@ class VIEWS_EXPORT StyledLabel : public View, public LinkListener { } // View implementation: - virtual gfx::Insets GetInsets() const OVERRIDE; - virtual int GetHeightForWidth(int w) const OVERRIDE; - virtual void Layout() OVERRIDE; - virtual void PreferredSizeChanged() OVERRIDE; + virtual gfx::Insets GetInsets() const override; + virtual int GetHeightForWidth(int w) const override; + virtual void Layout() override; + virtual void PreferredSizeChanged() override; // LinkListener implementation: - virtual void LinkClicked(Link* source, int event_flags) OVERRIDE; + virtual void LinkClicked(Link* source, int event_flags) override; private: struct StyleRange { diff --git a/ui/views/controls/styled_label_unittest.cc b/ui/views/controls/styled_label_unittest.cc index 624c146..144e03f 100644 --- a/ui/views/controls/styled_label_unittest.cc +++ b/ui/views/controls/styled_label_unittest.cc @@ -28,7 +28,7 @@ class StyledLabelTest : public ViewsTestBase, public StyledLabelListener { // StyledLabelListener implementation. virtual void StyledLabelLinkClicked(const gfx::Range& range, - int event_flags) OVERRIDE {} + int event_flags) override {} protected: StyledLabel* styled() { return styled_.get(); } diff --git a/ui/views/controls/tabbed_pane/tabbed_pane.cc b/ui/views/controls/tabbed_pane/tabbed_pane.cc index 3d181e0c..aa4b307 100644 --- a/ui/views/controls/tabbed_pane/tabbed_pane.cc +++ b/ui/views/controls/tabbed_pane/tabbed_pane.cc @@ -43,12 +43,12 @@ class Tab : public View { void SetSelected(bool selected); // Overridden from View: - virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE; - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual void Layout() OVERRIDE; + virtual bool OnMousePressed(const ui::MouseEvent& event) override; + virtual void OnMouseEntered(const ui::MouseEvent& event) override; + virtual void OnMouseExited(const ui::MouseEvent& event) override; + virtual void OnGestureEvent(ui::GestureEvent* event) override; + virtual gfx::Size GetPreferredSize() const override; + virtual void Layout() override; private: enum TabState { @@ -76,9 +76,9 @@ class TabStrip : public View { virtual ~TabStrip(); // Overridden from View: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual void Layout() OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual void Layout() override; + virtual void OnPaint(gfx::Canvas* canvas) override; private: TabbedPane* tabbed_pane_; diff --git a/ui/views/controls/tabbed_pane/tabbed_pane.h b/ui/views/controls/tabbed_pane/tabbed_pane.h index 83c7fef..c404808 100644 --- a/ui/views/controls/tabbed_pane/tabbed_pane.h +++ b/ui/views/controls/tabbed_pane/tabbed_pane.h @@ -54,8 +54,8 @@ class VIEWS_EXPORT TabbedPane : public View { void SelectTab(Tab* tab); // Overridden from View: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual const char* GetClassName() const OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual const char* GetClassName() const override; private: friend class TabStrip; @@ -64,12 +64,12 @@ class VIEWS_EXPORT TabbedPane : public View { Tab* GetTabAt(int index); // Overridden from View: - virtual void Layout() OVERRIDE; + virtual void Layout() override; virtual void ViewHierarchyChanged( - const ViewHierarchyChangedDetails& details) OVERRIDE; - virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; - virtual void OnFocus() OVERRIDE; - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; + const ViewHierarchyChangedDetails& details) override; + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) override; + virtual void OnFocus() override; + virtual void GetAccessibleState(ui::AXViewState* state) override; // A listener notified when tab selection changes. Weak, not owned. TabbedPaneListener* listener_; diff --git a/ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc b/ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc index f81c2a8..8a4acd4 100644 --- a/ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc +++ b/ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc @@ -22,7 +22,7 @@ class FixedSizeView : public View { : size_(size) {} // Overridden from View: - virtual gfx::Size GetPreferredSize() const OVERRIDE { + virtual gfx::Size GetPreferredSize() const override { return size_; } diff --git a/ui/views/controls/table/table_header.h b/ui/views/controls/table/table_header.h index a595de9..55c0949 100644 --- a/ui/views/controls/table/table_header.h +++ b/ui/views/controls/table/table_header.h @@ -28,15 +28,15 @@ class VIEWS_EXPORT TableHeader : public views::View { const gfx::FontList& font_list() const { return font_list_; } // views::View overrides. - virtual void Layout() OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual gfx::NativeCursor GetCursor(const ui::MouseEvent& event) OVERRIDE; - virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; - virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseCaptureLost() OVERRIDE; - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; + virtual void Layout() override; + virtual void OnPaint(gfx::Canvas* canvas) override; + virtual gfx::Size GetPreferredSize() const override; + virtual gfx::NativeCursor GetCursor(const ui::MouseEvent& event) override; + virtual bool OnMousePressed(const ui::MouseEvent& event) override; + virtual bool OnMouseDragged(const ui::MouseEvent& event) override; + virtual void OnMouseReleased(const ui::MouseEvent& event) override; + virtual void OnMouseCaptureLost() override; + virtual void OnGestureEvent(ui::GestureEvent* event) override; private: // Used to track the column being resized. diff --git a/ui/views/controls/table/table_view.h b/ui/views/controls/table/table_view.h index 9626806..c1a9162 100644 --- a/ui/views/controls/table/table_view.h +++ b/ui/views/controls/table/table_view.h @@ -165,28 +165,28 @@ class VIEWS_EXPORT TableView int row_height() const { return row_height_; } // View overrides: - virtual void Layout() OVERRIDE; - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE; - virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; + virtual void Layout() override; + virtual gfx::Size GetPreferredSize() const override; + virtual bool OnKeyPressed(const ui::KeyEvent& event) override; + virtual bool OnMousePressed(const ui::MouseEvent& event) override; + virtual void OnGestureEvent(ui::GestureEvent* event) override; virtual bool GetTooltipText(const gfx::Point& p, - base::string16* tooltip) const OVERRIDE; + base::string16* tooltip) const override; virtual bool GetTooltipTextOrigin(const gfx::Point& p, - gfx::Point* loc) const OVERRIDE; + gfx::Point* loc) const override; // ui::TableModelObserver overrides: - virtual void OnModelChanged() OVERRIDE; - virtual void OnItemsChanged(int start, int length) OVERRIDE; - virtual void OnItemsAdded(int start, int length) OVERRIDE; - virtual void OnItemsRemoved(int start, int length) OVERRIDE; + virtual void OnModelChanged() override; + virtual void OnItemsChanged(int start, int length) override; + virtual void OnItemsAdded(int start, int length) override; + virtual void OnItemsRemoved(int start, int length) override; protected: // View overrides: - virtual gfx::Point GetKeyboardContextMenuLocation() OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; - virtual void OnFocus() OVERRIDE; - virtual void OnBlur() OVERRIDE; + virtual gfx::Point GetKeyboardContextMenuLocation() override; + virtual void OnPaint(gfx::Canvas* canvas) override; + virtual void OnFocus() override; + virtual void OnBlur() override; private: friend class TableViewTestHelper; diff --git a/ui/views/controls/table/table_view_unittest.cc b/ui/views/controls/table/table_view_unittest.cc index 6ce06c8..535c650 100644 --- a/ui/views/controls/table/table_view_unittest.cc +++ b/ui/views/controls/table/table_view_unittest.cc @@ -66,10 +66,10 @@ class TestTableModel2 : public ui::TableModel { void ChangeRow(int row, int c1_value, int c2_value); // ui::TableModel: - virtual int RowCount() OVERRIDE; - virtual base::string16 GetText(int row, int column_id) OVERRIDE; - virtual void SetObserver(ui::TableModelObserver* observer) OVERRIDE; - virtual int CompareValues(int row1, int row2, int column_id) OVERRIDE; + virtual int RowCount() override; + virtual base::string16 GetText(int row, int column_id) override; + virtual void SetObserver(ui::TableModelObserver* observer) override; + virtual int CompareValues(int row1, int row2, int column_id) override; private: ui::TableModelObserver* observer_; @@ -157,7 +157,7 @@ class TestTableView : public TableView { } // View overrides: - virtual bool HasFocus() const OVERRIDE { + virtual bool HasFocus() const override { // Overriden so key processing works. return true; } @@ -172,7 +172,7 @@ class TableViewTest : public testing::Test { public: TableViewTest() : table_(NULL) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { model_.reset(new TestTableModel2); std::vector<ui::TableColumn> columns(2); columns[0].title = base::ASCIIToUTF16("Title Column 0"); @@ -410,7 +410,7 @@ class TableGrouperImpl : public TableGrouper { } // TableGrouper overrides: - virtual void GetGroupRange(int model_index, GroupRange* range) OVERRIDE { + virtual void GetGroupRange(int model_index, GroupRange* range) override { int offset = 0; size_t range_index = 0; for (; range_index < ranges_.size() && offset < model_index; ++range_index) @@ -514,7 +514,7 @@ class TableViewObserverImpl : public TableViewObserver { } // TableViewObserver overrides: - virtual void OnSelectionChanged() OVERRIDE { + virtual void OnSelectionChanged() override { selection_changed_count_++; } diff --git a/ui/views/controls/table/test_table_model.h b/ui/views/controls/table/test_table_model.h index 8338aae..a06db77 100644 --- a/ui/views/controls/table/test_table_model.h +++ b/ui/views/controls/table/test_table_model.h @@ -14,10 +14,10 @@ class TestTableModel : public ui::TableModel { virtual ~TestTableModel(); // ui::TableModel overrides: - virtual int RowCount() OVERRIDE; - virtual base::string16 GetText(int row, int column_id) OVERRIDE; - virtual gfx::ImageSkia GetIcon(int row) OVERRIDE; - virtual void SetObserver(ui::TableModelObserver* observer) OVERRIDE; + virtual int RowCount() override; + virtual base::string16 GetText(int row, int column_id) override; + virtual gfx::ImageSkia GetIcon(int row) override; + virtual void SetObserver(ui::TableModelObserver* observer) override; private: int row_count_; diff --git a/ui/views/controls/textfield/textfield.h b/ui/views/controls/textfield/textfield.h index d577d90..53f0ee6 100644 --- a/ui/views/controls/textfield/textfield.h +++ b/ui/views/controls/textfield/textfield.h @@ -205,110 +205,110 @@ class VIEWS_EXPORT Textfield : public View, bool HasTextBeingDragged(); // View overrides: - virtual gfx::Insets GetInsets() const OVERRIDE; - virtual int GetBaseline() const OVERRIDE; - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual const char* GetClassName() const OVERRIDE; - virtual gfx::NativeCursor GetCursor(const ui::MouseEvent& event) OVERRIDE; - virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; - virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE; - virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE; - virtual ui::TextInputClient* GetTextInputClient() OVERRIDE; - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; - virtual void AboutToRequestFocusFromTabTraversal(bool reverse) OVERRIDE; + virtual gfx::Insets GetInsets() const override; + virtual int GetBaseline() const override; + virtual gfx::Size GetPreferredSize() const override; + virtual const char* GetClassName() const override; + virtual gfx::NativeCursor GetCursor(const ui::MouseEvent& event) override; + virtual bool OnMousePressed(const ui::MouseEvent& event) override; + virtual bool OnMouseDragged(const ui::MouseEvent& event) override; + virtual void OnMouseReleased(const ui::MouseEvent& event) override; + virtual bool OnKeyPressed(const ui::KeyEvent& event) override; + virtual ui::TextInputClient* GetTextInputClient() override; + virtual void OnGestureEvent(ui::GestureEvent* event) override; + virtual void AboutToRequestFocusFromTabTraversal(bool reverse) override; virtual bool SkipDefaultKeyEventProcessing( - const ui::KeyEvent& event) OVERRIDE; + const ui::KeyEvent& event) override; virtual bool GetDropFormats( int* formats, - std::set<ui::OSExchangeData::CustomFormat>* custom_formats) OVERRIDE; - virtual bool CanDrop(const ui::OSExchangeData& data) OVERRIDE; - virtual int OnDragUpdated(const ui::DropTargetEvent& event) OVERRIDE; - virtual void OnDragExited() OVERRIDE; - virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE; - virtual void OnDragDone() OVERRIDE; - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; - virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE; - virtual bool GetNeedsNotificationWhenVisibleBoundsChange() const OVERRIDE; - virtual void OnVisibleBoundsChanged() OVERRIDE; - virtual void OnEnabledChanged() OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; - virtual void OnFocus() OVERRIDE; - virtual void OnBlur() OVERRIDE; - virtual gfx::Point GetKeyboardContextMenuLocation() OVERRIDE; - virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) OVERRIDE; + std::set<ui::OSExchangeData::CustomFormat>* custom_formats) override; + virtual bool CanDrop(const ui::OSExchangeData& data) override; + virtual int OnDragUpdated(const ui::DropTargetEvent& event) override; + virtual void OnDragExited() override; + virtual int OnPerformDrop(const ui::DropTargetEvent& event) override; + virtual void OnDragDone() override; + virtual void GetAccessibleState(ui::AXViewState* state) override; + virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) override; + virtual bool GetNeedsNotificationWhenVisibleBoundsChange() const override; + virtual void OnVisibleBoundsChanged() override; + virtual void OnEnabledChanged() override; + virtual void OnPaint(gfx::Canvas* canvas) override; + virtual void OnFocus() override; + virtual void OnBlur() override; + virtual gfx::Point GetKeyboardContextMenuLocation() override; + virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) override; // TextfieldModel::Delegate overrides: - virtual void OnCompositionTextConfirmedOrCleared() OVERRIDE; + virtual void OnCompositionTextConfirmedOrCleared() override; // ContextMenuController overrides: virtual void ShowContextMenuForView(View* source, const gfx::Point& point, - ui::MenuSourceType source_type) OVERRIDE; + ui::MenuSourceType source_type) override; // DragController overrides: virtual void WriteDragDataForView(View* sender, const gfx::Point& press_pt, - ui::OSExchangeData* data) OVERRIDE; + ui::OSExchangeData* data) override; virtual int GetDragOperationsForView(View* sender, - const gfx::Point& p) OVERRIDE; + const gfx::Point& p) override; virtual bool CanStartDragForView(View* sender, const gfx::Point& press_pt, - const gfx::Point& p) OVERRIDE; + const gfx::Point& p) override; // ui::TouchEditable overrides: virtual void SelectRect(const gfx::Point& start, - const gfx::Point& end) OVERRIDE; - virtual void MoveCaretTo(const gfx::Point& point) OVERRIDE; - virtual void GetSelectionEndPoints(gfx::Rect* p1, gfx::Rect* p2) OVERRIDE; - virtual gfx::Rect GetBounds() OVERRIDE; - virtual gfx::NativeView GetNativeView() const OVERRIDE; - virtual void ConvertPointToScreen(gfx::Point* point) OVERRIDE; - virtual void ConvertPointFromScreen(gfx::Point* point) OVERRIDE; - virtual bool DrawsHandles() OVERRIDE; - virtual void OpenContextMenu(const gfx::Point& anchor) OVERRIDE; - virtual void DestroyTouchSelection() OVERRIDE; + const gfx::Point& end) override; + virtual void MoveCaretTo(const gfx::Point& point) override; + virtual void GetSelectionEndPoints(gfx::Rect* p1, gfx::Rect* p2) override; + virtual gfx::Rect GetBounds() override; + virtual gfx::NativeView GetNativeView() const override; + virtual void ConvertPointToScreen(gfx::Point* point) override; + virtual void ConvertPointFromScreen(gfx::Point* point) override; + virtual bool DrawsHandles() override; + virtual void OpenContextMenu(const gfx::Point& anchor) override; + virtual void DestroyTouchSelection() override; // ui::SimpleMenuModel::Delegate overrides: - virtual bool IsCommandIdChecked(int command_id) const OVERRIDE; - virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE; + virtual bool IsCommandIdChecked(int command_id) const override; + virtual bool IsCommandIdEnabled(int command_id) const override; virtual bool GetAcceleratorForCommandId( int command_id, - ui::Accelerator* accelerator) OVERRIDE; - virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE; + ui::Accelerator* accelerator) override; + virtual void ExecuteCommand(int command_id, int event_flags) override; // ui::TextInputClient overrides: virtual void SetCompositionText( - const ui::CompositionText& composition) OVERRIDE; - virtual void ConfirmCompositionText() OVERRIDE; - virtual void ClearCompositionText() OVERRIDE; - virtual void InsertText(const base::string16& text) OVERRIDE; - virtual void InsertChar(base::char16 ch, int flags) OVERRIDE; - virtual gfx::NativeWindow GetAttachedWindow() const OVERRIDE; - virtual ui::TextInputType GetTextInputType() const OVERRIDE; - virtual ui::TextInputMode GetTextInputMode() const OVERRIDE; - virtual bool CanComposeInline() const OVERRIDE; - virtual gfx::Rect GetCaretBounds() const OVERRIDE; + const ui::CompositionText& composition) override; + virtual void ConfirmCompositionText() override; + virtual void ClearCompositionText() override; + virtual void InsertText(const base::string16& text) override; + virtual void InsertChar(base::char16 ch, int flags) override; + virtual gfx::NativeWindow GetAttachedWindow() const override; + virtual ui::TextInputType GetTextInputType() const override; + virtual ui::TextInputMode GetTextInputMode() const override; + virtual bool CanComposeInline() const override; + virtual gfx::Rect GetCaretBounds() const override; virtual bool GetCompositionCharacterBounds(uint32 index, - gfx::Rect* rect) const OVERRIDE; - virtual bool HasCompositionText() const OVERRIDE; - virtual bool GetTextRange(gfx::Range* range) const OVERRIDE; - virtual bool GetCompositionTextRange(gfx::Range* range) const OVERRIDE; - virtual bool GetSelectionRange(gfx::Range* range) const OVERRIDE; - virtual bool SetSelectionRange(const gfx::Range& range) OVERRIDE; - virtual bool DeleteRange(const gfx::Range& range) OVERRIDE; + gfx::Rect* rect) const override; + virtual bool HasCompositionText() const override; + virtual bool GetTextRange(gfx::Range* range) const override; + virtual bool GetCompositionTextRange(gfx::Range* range) const override; + virtual bool GetSelectionRange(gfx::Range* range) const override; + virtual bool SetSelectionRange(const gfx::Range& range) override; + virtual bool DeleteRange(const gfx::Range& range) override; virtual bool GetTextFromRange(const gfx::Range& range, - base::string16* text) const OVERRIDE; - virtual void OnInputMethodChanged() OVERRIDE; + base::string16* text) const override; + virtual void OnInputMethodChanged() override; virtual bool ChangeTextDirectionAndLayoutAlignment( - base::i18n::TextDirection direction) OVERRIDE; - virtual void ExtendSelectionAndDelete(size_t before, size_t after) OVERRIDE; - virtual void EnsureCaretInRect(const gfx::Rect& rect) OVERRIDE; - virtual void OnCandidateWindowShown() OVERRIDE; - virtual void OnCandidateWindowUpdated() OVERRIDE; - virtual void OnCandidateWindowHidden() OVERRIDE; - virtual bool IsEditingCommandEnabled(int command_id) OVERRIDE; - virtual void ExecuteEditingCommand(int command_id) OVERRIDE; + base::i18n::TextDirection direction) override; + virtual void ExtendSelectionAndDelete(size_t before, size_t after) override; + virtual void EnsureCaretInRect(const gfx::Rect& rect) override; + virtual void OnCandidateWindowShown() override; + virtual void OnCandidateWindowUpdated() override; + virtual void OnCandidateWindowHidden() override; + virtual bool IsEditingCommandEnabled(int command_id) override; + virtual void ExecuteEditingCommand(int command_id) override; protected: // Returns the TextfieldModel's text/cursor/selection rendering model. diff --git a/ui/views/controls/textfield/textfield_model.cc b/ui/views/controls/textfield/textfield_model.cc index 1e5bab5..fba7e11 100644 --- a/ui/views/controls/textfield/textfield_model.cc +++ b/ui/views/controls/textfield/textfield_model.cc @@ -160,7 +160,7 @@ class InsertEdit : public Edit { } // Edit implementation. - virtual bool DoMerge(const Edit* edit) OVERRIDE { + virtual bool DoMerge(const Edit* edit) override { if (edit->type() != INSERT_EDIT || new_text_end() != edit->new_text_start_) return false; // If continuous edit, merge it. @@ -193,7 +193,7 @@ class ReplaceEdit : public Edit { } // Edit implementation. - virtual bool DoMerge(const Edit* edit) OVERRIDE { + virtual bool DoMerge(const Edit* edit) override { if (edit->type() == DELETE_EDIT || new_text_end() != edit->old_text_start_ || edit->old_text_start_ != edit->new_text_start_) @@ -223,7 +223,7 @@ class DeleteEdit : public Edit { } // Edit implementation. - virtual bool DoMerge(const Edit* edit) OVERRIDE { + virtual bool DoMerge(const Edit* edit) override { if (edit->type() != DELETE_EDIT) return false; diff --git a/ui/views/controls/textfield/textfield_model_unittest.cc b/ui/views/controls/textfield/textfield_model_unittest.cc index 0239516..e5b1dfd 100644 --- a/ui/views/controls/textfield/textfield_model_unittest.cc +++ b/ui/views/controls/textfield/textfield_model_unittest.cc @@ -50,7 +50,7 @@ class TextfieldModelTest : public ViewsTestBase, composition_text_confirmed_or_cleared_(false) { } - virtual void OnCompositionTextConfirmedOrCleared() OVERRIDE { + virtual void OnCompositionTextConfirmedOrCleared() override { composition_text_confirmed_or_cleared_ = true; } diff --git a/ui/views/controls/textfield/textfield_unittest.cc b/ui/views/controls/textfield/textfield_unittest.cc index 56f4c5d..560bb41 100644 --- a/ui/views/controls/textfield/textfield_unittest.cc +++ b/ui/views/controls/textfield/textfield_unittest.cc @@ -64,7 +64,7 @@ class TestTextfield : public views::Textfield { key_received_(false), weak_ptr_factory_(this) {} - virtual bool OnKeyPressed(const ui::KeyEvent& e) OVERRIDE { + virtual bool OnKeyPressed(const ui::KeyEvent& e) override { key_received_ = true; // Since OnKeyPressed() might destroy |this|, get a weak pointer and @@ -80,7 +80,7 @@ class TestTextfield : public views::Textfield { return key_handled_; } - virtual bool OnKeyReleased(const ui::KeyEvent& e) OVERRIDE { + virtual bool OnKeyReleased(const ui::KeyEvent& e) override { key_received_ = true; key_handled_ = views::Textfield::OnKeyReleased(e); return key_handled_; @@ -123,7 +123,7 @@ class TextfieldDestroyerController : public views::TextfieldController { // views::TextfieldController: virtual bool HandleKeyEvent(views::Textfield* sender, - const ui::KeyEvent& key_event) OVERRIDE { + const ui::KeyEvent& key_event) override { target_.reset(); return false; } @@ -177,22 +177,22 @@ class TextfieldTest : public ViewsTestBase, public TextfieldController { // TextfieldController: virtual void ContentsChanged(Textfield* sender, - const base::string16& new_contents) OVERRIDE { + const base::string16& new_contents) override { // Paste calls TextfieldController::ContentsChanged() explicitly even if the // paste action did not change the content. So |new_contents| may match // |last_contents_|. For more info, see http://crbug.com/79002 last_contents_ = new_contents; } - virtual void OnBeforeUserAction(Textfield* sender) OVERRIDE { + virtual void OnBeforeUserAction(Textfield* sender) override { ++on_before_user_action_; } - virtual void OnAfterUserAction(Textfield* sender) OVERRIDE { + virtual void OnAfterUserAction(Textfield* sender) override { ++on_after_user_action_; } - virtual void OnAfterCutOrCopy(ui::ClipboardType clipboard_type) OVERRIDE { + virtual void OnAfterCutOrCopy(ui::ClipboardType clipboard_type) override { copied_to_clipboard_ = clipboard_type; } @@ -632,7 +632,7 @@ TEST_F(TextfieldTest, OnKeyPressBinding) { virtual bool MatchEvent( const ui::Event& event, - std::vector<ui::TextEditCommandAuraLinux>* commands) OVERRIDE { + std::vector<ui::TextEditCommandAuraLinux>* commands) override { return false; } diff --git a/ui/views/controls/throbber.h b/ui/views/controls/throbber.h index 08188c3..493cffe 100644 --- a/ui/views/controls/throbber.h +++ b/ui/views/controls/throbber.h @@ -37,8 +37,8 @@ class VIEWS_EXPORT Throbber : public View { void SetFrames(const gfx::ImageSkia* frames); // Overridden from View: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual void OnPaint(gfx::Canvas* canvas) override; protected: // Specifies whether the throbber is currently animating or not @@ -67,8 +67,8 @@ class VIEWS_EXPORT SmoothedThrobber : public Throbber { SmoothedThrobber(int frame_delay_ms, gfx::ImageSkia* frames); virtual ~SmoothedThrobber(); - virtual void Start() OVERRIDE; - virtual void Stop() OVERRIDE; + virtual void Start() override; + virtual void Stop() override; void set_start_delay_ms(int value) { start_delay_ms_ = value; } void set_stop_delay_ms(int value) { stop_delay_ms_ = value; } @@ -108,7 +108,7 @@ class VIEWS_EXPORT CheckmarkThrobber : public Throbber { void SetChecked(bool checked); // Overridden from Throbber: - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + virtual void OnPaint(gfx::Canvas* canvas) override; private: static const int kFrameTimeMs = 30; diff --git a/ui/views/controls/tree/tree_view.h b/ui/views/controls/tree/tree_view.h index 3cae3b5..dcecc9f 100644 --- a/ui/views/controls/tree/tree_view.h +++ b/ui/views/controls/tree/tree_view.h @@ -120,54 +120,54 @@ class VIEWS_EXPORT TreeView : public ui::TreeModelObserver, views::Textfield* editor() { return editor_; } // View overrides: - virtual void Layout() OVERRIDE; - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; - virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; - virtual ui::TextInputClient* GetTextInputClient() OVERRIDE; - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; + virtual void Layout() override; + virtual gfx::Size GetPreferredSize() const override; + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) override; + virtual bool OnMousePressed(const ui::MouseEvent& event) override; + virtual ui::TextInputClient* GetTextInputClient() override; + virtual void OnGestureEvent(ui::GestureEvent* event) override; virtual void ShowContextMenu(const gfx::Point& p, - ui::MenuSourceType source_type) OVERRIDE; - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; - virtual const char* GetClassName() const OVERRIDE; + ui::MenuSourceType source_type) override; + virtual void GetAccessibleState(ui::AXViewState* state) override; + virtual const char* GetClassName() const override; // TreeModelObserver overrides: virtual void TreeNodesAdded(ui::TreeModel* model, ui::TreeModelNode* parent, int start, - int count) OVERRIDE; + int count) override; virtual void TreeNodesRemoved(ui::TreeModel* model, ui::TreeModelNode* parent, int start, - int count) OVERRIDE; + int count) override; virtual void TreeNodeChanged(ui::TreeModel* model, - ui::TreeModelNode* model_node) OVERRIDE; + ui::TreeModelNode* model_node) override; // TextfieldController overrides: virtual void ContentsChanged(Textfield* sender, - const base::string16& new_contents) OVERRIDE; + const base::string16& new_contents) override; virtual bool HandleKeyEvent(Textfield* sender, - const ui::KeyEvent& key_event) OVERRIDE; + const ui::KeyEvent& key_event) override; // FocusChangeListener overrides: virtual void OnWillChangeFocus(View* focused_before, - View* focused_now) OVERRIDE; + View* focused_now) override; virtual void OnDidChangeFocus(View* focused_before, - View* focused_now) OVERRIDE; + View* focused_now) override; // PrefixDelegate overrides: - virtual int GetRowCount() OVERRIDE; - virtual int GetSelectedRow() OVERRIDE; - virtual void SetSelectedRow(int row) OVERRIDE; - virtual base::string16 GetTextForRow(int row) OVERRIDE; + virtual int GetRowCount() override; + virtual int GetSelectedRow() override; + virtual void SetSelectedRow(int row) override; + virtual base::string16 GetTextForRow(int row) override; protected: // View overrides: - virtual gfx::Point GetKeyboardContextMenuLocation() OVERRIDE; - virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; - virtual void OnFocus() OVERRIDE; - virtual void OnBlur() OVERRIDE; + virtual gfx::Point GetKeyboardContextMenuLocation() override; + virtual bool OnKeyPressed(const ui::KeyEvent& event) override; + virtual void OnPaint(gfx::Canvas* canvas) override; + virtual void OnFocus() override; + virtual void OnBlur() override; private: friend class TreeViewTest; diff --git a/ui/views/controls/webview/web_dialog_view.h b/ui/views/controls/webview/web_dialog_view.h index 2e69ad3..40d7616 100644 --- a/ui/views/controls/webview/web_dialog_view.h +++ b/ui/views/controls/webview/web_dialog_view.h @@ -52,69 +52,69 @@ class WEBVIEW_EXPORT WebDialogView : public views::ClientView, content::WebContents* web_contents(); // Overridden from views::ClientView: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual gfx::Size GetMinimumSize() const OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual gfx::Size GetMinimumSize() const override; virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) - OVERRIDE; + override; virtual void ViewHierarchyChanged( - const ViewHierarchyChangedDetails& details) OVERRIDE; - virtual bool CanClose() OVERRIDE; + const ViewHierarchyChangedDetails& details) override; + virtual bool CanClose() override; // Overridden from views::WidgetDelegate: - virtual bool CanResize() const OVERRIDE; - virtual ui::ModalType GetModalType() const OVERRIDE; - virtual base::string16 GetWindowTitle() const OVERRIDE; - virtual std::string GetWindowName() const OVERRIDE; - virtual void WindowClosing() OVERRIDE; - virtual views::View* GetContentsView() OVERRIDE; - virtual ClientView* CreateClientView(views::Widget* widget) OVERRIDE; - virtual views::View* GetInitiallyFocusedView() OVERRIDE; - virtual bool ShouldShowWindowTitle() const OVERRIDE; - virtual views::Widget* GetWidget() OVERRIDE; - virtual const views::Widget* GetWidget() const OVERRIDE; + virtual bool CanResize() const override; + virtual ui::ModalType GetModalType() const override; + virtual base::string16 GetWindowTitle() const override; + virtual std::string GetWindowName() const override; + virtual void WindowClosing() override; + virtual views::View* GetContentsView() override; + virtual ClientView* CreateClientView(views::Widget* widget) override; + virtual views::View* GetInitiallyFocusedView() override; + virtual bool ShouldShowWindowTitle() const override; + virtual views::Widget* GetWidget() override; + virtual const views::Widget* GetWidget() const override; // Overridden from ui::WebDialogDelegate: - virtual ui::ModalType GetDialogModalType() const OVERRIDE; - virtual base::string16 GetDialogTitle() const OVERRIDE; - virtual GURL GetDialogContentURL() const OVERRIDE; + virtual ui::ModalType GetDialogModalType() const override; + virtual base::string16 GetDialogTitle() const override; + virtual GURL GetDialogContentURL() const override; virtual void GetWebUIMessageHandlers( - std::vector<content::WebUIMessageHandler*>* handlers) const OVERRIDE; - virtual void GetDialogSize(gfx::Size* size) const OVERRIDE; - virtual void GetMinimumDialogSize(gfx::Size* size) const OVERRIDE; - virtual std::string GetDialogArgs() const OVERRIDE; + std::vector<content::WebUIMessageHandler*>* handlers) const override; + virtual void GetDialogSize(gfx::Size* size) const override; + virtual void GetMinimumDialogSize(gfx::Size* size) const override; + virtual std::string GetDialogArgs() const override; virtual void OnDialogShown( content::WebUI* webui, - content::RenderViewHost* render_view_host) OVERRIDE; - virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE; + content::RenderViewHost* render_view_host) override; + virtual void OnDialogClosed(const std::string& json_retval) override; virtual void OnDialogCloseFromWebUI( - const std::string& json_retval) OVERRIDE; + const std::string& json_retval) override; virtual void OnCloseContents(content::WebContents* source, - bool* out_close_dialog) OVERRIDE; - virtual bool ShouldShowDialogTitle() const OVERRIDE; + bool* out_close_dialog) override; + virtual bool ShouldShowDialogTitle() const override; virtual bool HandleContextMenu( - const content::ContextMenuParams& params) OVERRIDE; + const content::ContextMenuParams& params) override; // Overridden from content::WebContentsDelegate: virtual void MoveContents(content::WebContents* source, - const gfx::Rect& pos) OVERRIDE; + const gfx::Rect& pos) override; virtual void HandleKeyboardEvent( content::WebContents* source, - const content::NativeWebKeyboardEvent& event) OVERRIDE; - virtual void CloseContents(content::WebContents* source) OVERRIDE; + const content::NativeWebKeyboardEvent& event) override; + virtual void CloseContents(content::WebContents* source) override; virtual content::WebContents* OpenURLFromTab( content::WebContents* source, - const content::OpenURLParams& params) OVERRIDE; + const content::OpenURLParams& params) override; virtual void AddNewContents(content::WebContents* source, content::WebContents* new_contents, WindowOpenDisposition disposition, const gfx::Rect& initial_pos, bool user_gesture, - bool* was_blocked) OVERRIDE; + bool* was_blocked) override; virtual void LoadingStateChanged(content::WebContents* source, - bool to_different_document) OVERRIDE; + bool to_different_document) override; virtual void BeforeUnloadFired(content::WebContents* tab, bool proceed, - bool* proceed_to_fire_unload) OVERRIDE; + bool* proceed_to_fire_unload) override; private: FRIEND_TEST_ALL_PREFIXES(WebDialogBrowserTest, WebContentRendered); diff --git a/ui/views/controls/webview/webview.h b/ui/views/controls/webview/webview.h index 850b2ba..32d423a 100644 --- a/ui/views/controls/webview/webview.h +++ b/ui/views/controls/webview/webview.h @@ -89,8 +89,8 @@ class WEBVIEW_EXPORT WebView : public View, void SetPreferredSize(const gfx::Size& preferred_size); // Overridden from View: - virtual const char* GetClassName() const OVERRIDE; - virtual ui::TextInputClient* GetTextInputClient() OVERRIDE; + virtual const char* GetClassName() const override; + virtual ui::TextInputClient* GetTextInputClient() override; protected: // Swaps the owned WebContents |wc_owner_| with |new_web_contents|. Returns @@ -99,38 +99,38 @@ class WEBVIEW_EXPORT WebView : public View, scoped_ptr<content::WebContents> new_web_contents); // Overridden from View: - virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE; + virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) override; virtual void ViewHierarchyChanged( - const ViewHierarchyChangedDetails& details) OVERRIDE; + const ViewHierarchyChangedDetails& details) override; virtual bool SkipDefaultKeyEventProcessing( - const ui::KeyEvent& event) OVERRIDE; - virtual void OnFocus() OVERRIDE; - virtual void AboutToRequestFocusFromTabTraversal(bool reverse) OVERRIDE; - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; - virtual gfx::NativeViewAccessible GetNativeViewAccessible() OVERRIDE; - virtual gfx::Size GetPreferredSize() const OVERRIDE; + const ui::KeyEvent& event) override; + virtual void OnFocus() override; + virtual void AboutToRequestFocusFromTabTraversal(bool reverse) override; + virtual void GetAccessibleState(ui::AXViewState* state) override; + virtual gfx::NativeViewAccessible GetNativeViewAccessible() override; + virtual gfx::Size GetPreferredSize() const override; // Overridden from content::WebContentsDelegate: - virtual void WebContentsFocused(content::WebContents* web_contents) OVERRIDE; - virtual bool EmbedsFullscreenWidget() const OVERRIDE; + virtual void WebContentsFocused(content::WebContents* web_contents) override; + virtual bool EmbedsFullscreenWidget() const override; // Overridden from content::WebContentsObserver: virtual void RenderViewDeleted( - content::RenderViewHost* render_view_host) OVERRIDE; - virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE; + content::RenderViewHost* render_view_host) override; + virtual void RenderProcessGone(base::TerminationStatus status) override; virtual void RenderViewHostChanged( content::RenderViewHost* old_host, - content::RenderViewHost* new_host) OVERRIDE; - virtual void DidShowFullscreenWidget(int routing_id) OVERRIDE; - virtual void DidDestroyFullscreenWidget(int routing_id) OVERRIDE; - virtual void DidToggleFullscreenModeForTab(bool entered_fullscreen) OVERRIDE; - virtual void DidAttachInterstitialPage() OVERRIDE; - virtual void DidDetachInterstitialPage() OVERRIDE; + content::RenderViewHost* new_host) override; + virtual void DidShowFullscreenWidget(int routing_id) override; + virtual void DidDestroyFullscreenWidget(int routing_id) override; + virtual void DidToggleFullscreenModeForTab(bool entered_fullscreen) override; + virtual void DidAttachInterstitialPage() override; + virtual void DidDetachInterstitialPage() override; // Workaround for MSVC++ linker bug/feature that requires // instantiation of the inline IPC::Listener methods in all translation units. - virtual void OnChannelConnected(int32 peer_id) OVERRIDE {} - virtual void OnChannelError() OVERRIDE {} - virtual void OnBadMessageReceived(const IPC::Message& message) OVERRIDE {} + virtual void OnChannelConnected(int32 peer_id) override {} + virtual void OnChannelError() override {} + virtual void OnBadMessageReceived(const IPC::Message& message) override {} private: void AttachWebContents(); diff --git a/ui/views/controls/webview/webview_interactive_uitest.cc b/ui/views/controls/webview/webview_interactive_uitest.cc index f1179b8..1ccfc33 100644 --- a/ui/views/controls/webview/webview_interactive_uitest.cc +++ b/ui/views/controls/webview/webview_interactive_uitest.cc @@ -22,7 +22,7 @@ class WebViewInteractiveUiTest : public views::test::WidgetTest { WebViewInteractiveUiTest() : ui_thread_(content::BrowserThread::UI, base::MessageLoop::current()) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { gfx::GLSurface::InitializeOneOffForTests(); WidgetTest::SetUp(); } diff --git a/ui/views/controls/webview/webview_unittest.cc b/ui/views/controls/webview/webview_unittest.cc index a6a250d..6cb92ff 100644 --- a/ui/views/controls/webview/webview_unittest.cc +++ b/ui/views/controls/webview/webview_unittest.cc @@ -26,7 +26,7 @@ class WebViewTestViewsDelegate : public views::TestViewsDelegate { // Overriden from TestViewsDelegate. virtual content::WebContents* CreateWebContents( content::BrowserContext* browser_context, - content::SiteInstance* site_instance) OVERRIDE { + content::SiteInstance* site_instance) override { return content::WebContentsTester::CreateTestWebContents(browser_context, site_instance); } @@ -46,7 +46,7 @@ class WebViewUnitTest : public views::test::WidgetTest { virtual ~WebViewUnitTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { // The ViewsDelegate is deleted when the ViewsTestBase class is torn down. WidgetTest::set_views_delegate(new WebViewTestViewsDelegate); browser_context_.reset(new content::TestBrowserContext); @@ -56,7 +56,7 @@ class WebViewUnitTest : public views::test::WidgetTest { SetBrowserClientForTesting(&test_browser_client_); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { browser_context_.reset(NULL); // Flush the message loop to execute pending relase tasks as this would // upset ASAN and Valgrind. @@ -95,20 +95,20 @@ class WebViewTestWebContentsObserver : public content::WebContentsObserver { content::WebContentsObserver::Observe(NULL); } - virtual void WebContentsDestroyed() OVERRIDE { + virtual void WebContentsDestroyed() override { DCHECK(web_contents_); content::WebContentsObserver::Observe(NULL); web_contents_ = NULL; } - virtual void WasShown() OVERRIDE { + virtual void WasShown() override { valid_root_while_shown_ = web_contents()->GetNativeView()->GetRootWindow() != NULL; was_shown_ = true; ++shown_count_; } - virtual void WasHidden() OVERRIDE { + virtual void WasHidden() override { was_shown_ = false; ++hidden_count_; } diff --git a/ui/views/corewm/capture_controller_unittest.cc b/ui/views/corewm/capture_controller_unittest.cc index 9a536ae..da2ca72 100644 --- a/ui/views/corewm/capture_controller_unittest.cc +++ b/ui/views/corewm/capture_controller_unittest.cc @@ -30,7 +30,7 @@ class CaptureControllerTest : public aura::test::AuraTestBase { public: CaptureControllerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { AuraTestBase::SetUp(); capture_controller_.reset(new wm::ScopedCaptureClient(root_window())); @@ -50,7 +50,7 @@ class CaptureControllerTest : public aura::test::AuraTestBase { #endif } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { RunAllPendingInMessageLoop(); #if !defined(OS_CHROMEOS) diff --git a/ui/views/corewm/desktop_capture_controller_unittest.cc b/ui/views/corewm/desktop_capture_controller_unittest.cc index 3baf0f4..85c9c79 100644 --- a/ui/views/corewm/desktop_capture_controller_unittest.cc +++ b/ui/views/corewm/desktop_capture_controller_unittest.cc @@ -32,7 +32,7 @@ class DesktopCaptureControllerTest : public ViewsTestBase { DesktopCaptureControllerTest() {} virtual ~DesktopCaptureControllerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { gfx::GLSurface::InitializeOneOffForTests(); ui::RegisterPathProvider(); base::FilePath ui_test_pak_path; @@ -50,7 +50,7 @@ class DesktopViewInputTest : public View { DesktopViewInputTest() : received_gesture_event_(false) {} - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE { + virtual void OnGestureEvent(ui::GestureEvent* event) override { received_gesture_event_ = true; return View::OnGestureEvent(event); } diff --git a/ui/views/corewm/tooltip_aura.h b/ui/views/corewm/tooltip_aura.h index 9e8c5fa..24976b9 100644 --- a/ui/views/corewm/tooltip_aura.h +++ b/ui/views/corewm/tooltip_aura.h @@ -51,13 +51,13 @@ class VIEWS_EXPORT TooltipAura : public Tooltip, public WidgetObserver { // Tooltip: virtual void SetText(aura::Window* window, const base::string16& tooltip_text, - const gfx::Point& location) OVERRIDE; - virtual void Show() OVERRIDE; - virtual void Hide() OVERRIDE; - virtual bool IsVisible() OVERRIDE; + const gfx::Point& location) override; + virtual void Show() override; + virtual void Hide() override; + virtual bool IsVisible() override; // WidgetObserver: - virtual void OnWidgetDestroying(Widget* widget) OVERRIDE; + virtual void OnWidgetDestroying(Widget* widget) override; const gfx::ScreenType screen_type_; diff --git a/ui/views/corewm/tooltip_controller.h b/ui/views/corewm/tooltip_controller.h index e045334..8242725 100644 --- a/ui/views/corewm/tooltip_controller.h +++ b/ui/views/corewm/tooltip_controller.h @@ -38,19 +38,19 @@ class VIEWS_EXPORT TooltipController : public aura::client::TooltipClient, virtual ~TooltipController(); // Overridden from aura::client::TooltipClient. - virtual void UpdateTooltip(aura::Window* target) OVERRIDE; + virtual void UpdateTooltip(aura::Window* target) override; virtual void SetTooltipShownTimeout(aura::Window* target, - int timeout_in_ms) OVERRIDE; - virtual void SetTooltipsEnabled(bool enable) OVERRIDE; + int timeout_in_ms) override; + virtual void SetTooltipsEnabled(bool enable) override; // Overridden from ui::EventHandler. - virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE; - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; - virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE; - virtual void OnCancelMode(ui::CancelModeEvent* event) OVERRIDE; + virtual void OnKeyEvent(ui::KeyEvent* event) override; + virtual void OnMouseEvent(ui::MouseEvent* event) override; + virtual void OnTouchEvent(ui::TouchEvent* event) override; + virtual void OnCancelMode(ui::CancelModeEvent* event) override; // Overridden from aura::WindowObserver. - virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; + virtual void OnWindowDestroyed(aura::Window* window) override; const gfx::Point& mouse_location() const { return curr_mouse_loc_; } diff --git a/ui/views/corewm/tooltip_controller_test_helper.h b/ui/views/corewm/tooltip_controller_test_helper.h index 4451ff3..310a00c 100644 --- a/ui/views/corewm/tooltip_controller_test_helper.h +++ b/ui/views/corewm/tooltip_controller_test_helper.h @@ -57,7 +57,7 @@ class TooltipTestView : public views::View { // Overridden from views::View virtual bool GetTooltipText(const gfx::Point& p, - base::string16* tooltip) const OVERRIDE; + base::string16* tooltip) const override; private: base::string16 tooltip_text_; diff --git a/ui/views/corewm/tooltip_controller_unittest.cc b/ui/views/corewm/tooltip_controller_unittest.cc index 43f5c80..e083439 100644 --- a/ui/views/corewm/tooltip_controller_unittest.cc +++ b/ui/views/corewm/tooltip_controller_unittest.cc @@ -77,7 +77,7 @@ class TooltipControllerTest : public aura::test::AuraTestBase { TooltipControllerTest() : view_(NULL) {} virtual ~TooltipControllerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { #if defined(OS_CHROMEOS) views_delegate_.reset(new TestViewsDelegate); #else @@ -103,7 +103,7 @@ class TooltipControllerTest : public aura::test::AuraTestBase { generator_.reset(new ui::test::EventGenerator(GetRootWindow())); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { #if defined(OS_CHROMEOS) root_window()->RemovePreTargetHandler(controller_.get()); aura::client::SetTooltipClient(root_window(), NULL); @@ -418,18 +418,18 @@ class TestScreenPositionClient : public aura::client::ScreenPositionClient { // ScreenPositionClient overrides: virtual void ConvertPointToScreen(const aura::Window* window, - gfx::Point* point) OVERRIDE { + gfx::Point* point) override { } virtual void ConvertPointFromScreen(const aura::Window* window, - gfx::Point* point) OVERRIDE { + gfx::Point* point) override { } virtual void ConvertHostPointToScreen(aura::Window* root_gwindow, - gfx::Point* point) OVERRIDE { + gfx::Point* point) override { NOTREACHED(); } virtual void SetBounds(aura::Window* window, const gfx::Rect& bounds, - const gfx::Display& display) OVERRIDE { + const gfx::Display& display) override { window->SetBounds(bounds); } @@ -444,7 +444,7 @@ class TooltipControllerCaptureTest : public TooltipControllerTest { TooltipControllerCaptureTest() {} virtual ~TooltipControllerCaptureTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { TooltipControllerTest::SetUp(); aura::client::SetScreenPositionClient(GetRootWindow(), &screen_position_client_); @@ -455,7 +455,7 @@ class TooltipControllerCaptureTest : public TooltipControllerTest { #endif } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { #if !defined(OS_CHROMEOS) gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen()); desktop_screen_.reset(); @@ -559,17 +559,17 @@ class TestTooltip : public Tooltip { // Tooltip: virtual void SetText(aura::Window* window, const base::string16& tooltip_text, - const gfx::Point& location) OVERRIDE { + const gfx::Point& location) override { tooltip_text_ = tooltip_text; location_ = location; } - virtual void Show() OVERRIDE { + virtual void Show() override { is_visible_ = true; } - virtual void Hide() OVERRIDE { + virtual void Hide() override { is_visible_ = false; } - virtual bool IsVisible() OVERRIDE { + virtual bool IsVisible() override { return is_visible_; } const gfx::Point& location() { return location_; } @@ -590,7 +590,7 @@ class TooltipControllerTest2 : public aura::test::AuraTestBase { TooltipControllerTest2() : test_tooltip_(new TestTooltip) {} virtual ~TooltipControllerTest2() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { wm_state_.reset(new wm::WMState); aura::test::AuraTestBase::SetUp(); new wm::DefaultActivationClient(root_window()); @@ -602,7 +602,7 @@ class TooltipControllerTest2 : public aura::test::AuraTestBase { generator_.reset(new ui::test::EventGenerator(root_window())); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { root_window()->RemovePreTargetHandler(controller_.get()); aura::client::SetTooltipClient(root_window(), NULL); controller_.reset(); @@ -665,7 +665,7 @@ class TooltipControllerTest3 : public aura::test::AuraTestBase { TooltipControllerTest3() : test_tooltip_(new TestTooltip) {} virtual ~TooltipControllerTest3() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { wm_state_.reset(new wm::WMState); aura::test::AuraTestBase::SetUp(); new wm::DefaultActivationClient(root_window()); @@ -687,7 +687,7 @@ class TooltipControllerTest3 : public aura::test::AuraTestBase { SetTooltipClient(GetRootWindow(), controller_.get()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { GetRootWindow()->RemovePreTargetHandler(controller_.get()); aura::client::SetTooltipClient(GetRootWindow(), NULL); diff --git a/ui/views/corewm/tooltip_win.h b/ui/views/corewm/tooltip_win.h index b031a32..23ee640 100644 --- a/ui/views/corewm/tooltip_win.h +++ b/ui/views/corewm/tooltip_win.h @@ -39,10 +39,10 @@ class VIEWS_EXPORT TooltipWin : public Tooltip { // Tooltip: virtual void SetText(aura::Window* window, const base::string16& tooltip_text, - const gfx::Point& location) OVERRIDE; - virtual void Show() OVERRIDE; - virtual void Hide() OVERRIDE; - virtual bool IsVisible() OVERRIDE; + const gfx::Point& location) override; + virtual void Show() override; + virtual void Hide() override; + virtual bool IsVisible() override; // The window |tooltip_hwnd_| is parented to. HWND parent_hwnd_; diff --git a/ui/views/examples/bubble_example.cc b/ui/views/examples/bubble_example.cc index 49a60e5..907611a 100644 --- a/ui/views/examples/bubble_example.cc +++ b/ui/views/examples/bubble_example.cc @@ -54,7 +54,7 @@ class ExampleBubble : public BubbleDelegateView { : BubbleDelegateView(anchor, arrow) {} protected: - virtual void Init() OVERRIDE { + virtual void Init() override { SetLayoutManager(new BoxLayout(BoxLayout::kVertical, 50, 50, 0)); AddChildView(new Label(GetArrowName(arrow()))); } diff --git a/ui/views/examples/bubble_example.h b/ui/views/examples/bubble_example.h index d9ad66d..eb5625c 100644 --- a/ui/views/examples/bubble_example.h +++ b/ui/views/examples/bubble_example.h @@ -19,11 +19,11 @@ class VIEWS_EXAMPLES_EXPORT BubbleExample : public ExampleBase, virtual ~BubbleExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; private: // ButtonListener: - virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; + virtual void ButtonPressed(Button* sender, const ui::Event& event) override; Button* no_shadow_; Button* big_shadow_; diff --git a/ui/views/examples/button_example.h b/ui/views/examples/button_example.h index 4e01a8a..8fc2c60 100644 --- a/ui/views/examples/button_example.h +++ b/ui/views/examples/button_example.h @@ -24,13 +24,13 @@ class VIEWS_EXAMPLES_EXPORT ButtonExample : public ExampleBase, virtual ~ButtonExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; private: void LabelButtonPressed(const ui::Event& event); // ButtonListener: - virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; + virtual void ButtonPressed(Button* sender, const ui::Event& event) override; // Example buttons. LabelButton* label_button_; diff --git a/ui/views/examples/checkbox_example.h b/ui/views/examples/checkbox_example.h index a5a8964..d95f1f4 100644 --- a/ui/views/examples/checkbox_example.h +++ b/ui/views/examples/checkbox_example.h @@ -22,11 +22,11 @@ class VIEWS_EXAMPLES_EXPORT CheckboxExample : public ExampleBase, virtual ~CheckboxExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; private: // ButtonListener: - virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; + virtual void ButtonPressed(Button* sender, const ui::Event& event) override; // The only control in this test. Checkbox* button_; diff --git a/ui/views/examples/combobox_example.h b/ui/views/examples/combobox_example.h index 89ccff2..3ea1c24 100644 --- a/ui/views/examples/combobox_example.h +++ b/ui/views/examples/combobox_example.h @@ -20,8 +20,8 @@ class VIEWS_EXAMPLES_EXPORT ComboboxModelExample : public ui::ComboboxModel { virtual ~ComboboxModelExample(); // ui::ComboboxModel: - virtual int GetItemCount() const OVERRIDE; - virtual base::string16 GetItemAt(int index) OVERRIDE; + virtual int GetItemCount() const override; + virtual base::string16 GetItemAt(int index) override; private: DISALLOW_COPY_AND_ASSIGN(ComboboxModelExample); @@ -34,11 +34,11 @@ class VIEWS_EXAMPLES_EXPORT ComboboxExample : public ExampleBase, virtual ~ComboboxExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; private: // ComboboxListener: - virtual void OnPerformAction(Combobox* combobox) OVERRIDE; + virtual void OnPerformAction(Combobox* combobox) override; ComboboxModelExample combobox_model_; Combobox* combobox_; diff --git a/ui/views/examples/double_split_view_example.cc b/ui/views/examples/double_split_view_example.cc index 8ff40df..dc794e6 100644 --- a/ui/views/examples/double_split_view_example.cc +++ b/ui/views/examples/double_split_view_example.cc @@ -22,7 +22,7 @@ class SplittedView : public View { void SetColor(SkColor from, SkColor to); // View: - virtual gfx::Size GetMinimumSize() const OVERRIDE; + virtual gfx::Size GetMinimumSize() const override; private: DISALLOW_COPY_AND_ASSIGN(SplittedView); diff --git a/ui/views/examples/double_split_view_example.h b/ui/views/examples/double_split_view_example.h index fe37c79..c83b8cb 100644 --- a/ui/views/examples/double_split_view_example.h +++ b/ui/views/examples/double_split_view_example.h @@ -19,7 +19,7 @@ class VIEWS_EXAMPLES_EXPORT DoubleSplitViewExample : public ExampleBase { virtual ~DoubleSplitViewExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; private: // The SingleSplitViews to be embedded. diff --git a/ui/views/examples/example_base.cc b/ui/views/examples/example_base.cc index a06fc1d..bb216f9 100644 --- a/ui/views/examples/example_base.cc +++ b/ui/views/examples/example_base.cc @@ -29,7 +29,7 @@ class ContainerView : public View { private: // View: virtual void ViewHierarchyChanged( - const ViewHierarchyChangedDetails& details) OVERRIDE { + const ViewHierarchyChangedDetails& details) override { View::ViewHierarchyChanged(details); // We're not using child == this because a Widget may not be // available when this is added to the hierarchy. diff --git a/ui/views/examples/example_combobox_model.h b/ui/views/examples/example_combobox_model.h index 3b23332..4988c60 100644 --- a/ui/views/examples/example_combobox_model.h +++ b/ui/views/examples/example_combobox_model.h @@ -17,8 +17,8 @@ class ExampleComboboxModel : public ui::ComboboxModel { virtual ~ExampleComboboxModel(); // ui::ComboboxModel: - virtual int GetItemCount() const OVERRIDE; - virtual base::string16 GetItemAt(int index) OVERRIDE; + virtual int GetItemCount() const override; + virtual base::string16 GetItemAt(int index) override; private: const char** strings_; diff --git a/ui/views/examples/examples_window.cc b/ui/views/examples/examples_window.cc index 596cb75..040fcdc 100644 --- a/ui/views/examples/examples_window.cc +++ b/ui/views/examples/examples_window.cc @@ -105,8 +105,8 @@ class ComboboxModelExampleList : public ui::ComboboxModel { } // ui::ComboboxModel: - virtual int GetItemCount() const OVERRIDE { return example_list_.size(); } - virtual base::string16 GetItemAt(int index) OVERRIDE { + virtual int GetItemCount() const override { return example_list_.size(); } + virtual base::string16 GetItemAt(int index) override { return base::UTF8ToUTF16(example_list_[index]->example_title()); } @@ -172,21 +172,21 @@ class ExamplesWindowContents : public WidgetDelegateView, private: // WidgetDelegateView: - virtual bool CanResize() const OVERRIDE { return true; } - virtual bool CanMaximize() const OVERRIDE { return true; } - virtual bool CanMinimize() const OVERRIDE { return true; } - virtual base::string16 GetWindowTitle() const OVERRIDE { + virtual bool CanResize() const override { return true; } + virtual bool CanMaximize() const override { return true; } + virtual bool CanMinimize() const override { return true; } + virtual base::string16 GetWindowTitle() const override { return base::ASCIIToUTF16("Views Examples"); } - virtual View* GetContentsView() OVERRIDE { return this; } - virtual void WindowClosing() OVERRIDE { + virtual View* GetContentsView() override { return this; } + virtual void WindowClosing() override { instance_ = NULL; if (operation_ == QUIT_ON_CLOSE) base::MessageLoopForUI::current()->Quit(); } // ComboboxListener: - virtual void OnPerformAction(Combobox* combobox) OVERRIDE { + virtual void OnPerformAction(Combobox* combobox) override { DCHECK_EQ(combobox, combobox_); DCHECK(combobox->selected_index() < combobox_model_.GetItemCount()); example_shown_->RemoveAllChildViews(false); diff --git a/ui/views/examples/label_example.cc b/ui/views/examples/label_example.cc index 178b62b..89e3223 100644 --- a/ui/views/examples/label_example.cc +++ b/ui/views/examples/label_example.cc @@ -37,7 +37,7 @@ class PreferredSizeLabel : public Label { virtual ~PreferredSizeLabel() {} // Label: - virtual gfx::Size GetPreferredSize() const OVERRIDE { + virtual gfx::Size GetPreferredSize() const override { return gfx::Size(50, Label::GetPreferredSize().height()); } diff --git a/ui/views/examples/label_example.h b/ui/views/examples/label_example.h index ea6cd94..f597742 100644 --- a/ui/views/examples/label_example.h +++ b/ui/views/examples/label_example.h @@ -30,17 +30,17 @@ class VIEWS_EXAMPLES_EXPORT LabelExample : public ExampleBase, virtual ~LabelExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; // ButtonListener: - virtual void ButtonPressed(Button* button, const ui::Event& event) OVERRIDE; + virtual void ButtonPressed(Button* button, const ui::Event& event) override; // ComboboxListener: - virtual void OnPerformAction(Combobox* combobox) OVERRIDE; + virtual void OnPerformAction(Combobox* combobox) override; // TextfieldController: virtual void ContentsChanged(Textfield* sender, - const base::string16& new_contents) OVERRIDE; + const base::string16& new_contents) override; private: // Add a customizable label and various controls to modify its presentation. diff --git a/ui/views/examples/link_example.h b/ui/views/examples/link_example.h index fd6e924..fa6bb57 100644 --- a/ui/views/examples/link_example.h +++ b/ui/views/examples/link_example.h @@ -19,11 +19,11 @@ class VIEWS_EXAMPLES_EXPORT LinkExample : public ExampleBase, virtual ~LinkExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; private: // LinkListener: - virtual void LinkClicked(Link* source, int event_flags) OVERRIDE; + virtual void LinkClicked(Link* source, int event_flags) override; Link* link_; diff --git a/ui/views/examples/menu_example.cc b/ui/views/examples/menu_example.cc index bc8845e..1b95457c 100644 --- a/ui/views/examples/menu_example.cc +++ b/ui/views/examples/menu_example.cc @@ -28,12 +28,12 @@ class ExampleMenuModel : public ui::SimpleMenuModel, ExampleMenuModel(); // ui::SimpleMenuModel::Delegate: - virtual bool IsCommandIdChecked(int command_id) const OVERRIDE; - virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE; + virtual bool IsCommandIdChecked(int command_id) const override; + virtual bool IsCommandIdEnabled(int command_id) const override; virtual bool GetAcceleratorForCommandId( int command_id, - ui::Accelerator* accelerator) OVERRIDE; - virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE; + ui::Accelerator* accelerator) override; + virtual void ExecuteCommand(int command_id, int event_flags) override; private: enum GroupID { @@ -66,7 +66,7 @@ class ExampleMenuButton : public MenuButton, public MenuButtonListener { private: // MenuButtonListener: virtual void OnMenuButtonClicked(View* source, - const gfx::Point& point) OVERRIDE; + const gfx::Point& point) override; ui::SimpleMenuModel* GetMenuModel(); diff --git a/ui/views/examples/menu_example.h b/ui/views/examples/menu_example.h index 3ed5d37..af370b3 100644 --- a/ui/views/examples/menu_example.h +++ b/ui/views/examples/menu_example.h @@ -19,7 +19,7 @@ class VIEWS_EXAMPLES_EXPORT MenuExample : public ExampleBase { virtual ~MenuExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; private: DISALLOW_COPY_AND_ASSIGN(MenuExample); diff --git a/ui/views/examples/message_box_example.h b/ui/views/examples/message_box_example.h index 692ae22..fe3ba67 100644 --- a/ui/views/examples/message_box_example.h +++ b/ui/views/examples/message_box_example.h @@ -24,11 +24,11 @@ class VIEWS_EXAMPLES_EXPORT MessageBoxExample : public ExampleBase, virtual ~MessageBoxExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; private: // ButtonListener: - virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; + virtual void ButtonPressed(Button* sender, const ui::Event& event) override; // The MessageBoxView to be tested. MessageBoxView* message_box_view_; diff --git a/ui/views/examples/multiline_example.cc b/ui/views/examples/multiline_example.cc index 8c86d9e2..d2d69cce 100644 --- a/ui/views/examples/multiline_example.cc +++ b/ui/views/examples/multiline_example.cc @@ -35,7 +35,7 @@ class PreferredSizeLabel : public Label { virtual ~PreferredSizeLabel() {} // Label: - virtual gfx::Size GetPreferredSize() const OVERRIDE { + virtual gfx::Size GetPreferredSize() const override { return gfx::Size(50, Label::GetPreferredSize().height()); } @@ -55,12 +55,12 @@ class MultilineExample::RenderTextView : public View { SetBorder(Border::CreateSolidBorder(2, SK_ColorGRAY)); } - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { + virtual void OnPaint(gfx::Canvas* canvas) override { View::OnPaint(canvas); render_text_->Draw(canvas); } - virtual gfx::Size GetPreferredSize() const OVERRIDE { + virtual gfx::Size GetPreferredSize() const override { // Turn off multiline mode to get the single-line text size, which is the // preferred size for this view. render_text_->SetMultiline(false); @@ -71,7 +71,7 @@ class MultilineExample::RenderTextView : public View { return size; } - virtual int GetHeightForWidth(int w) const OVERRIDE { + virtual int GetHeightForWidth(int w) const override { // TODO(ckocagil): Why does this happen? if (w == 0) return View::GetHeightForWidth(w); @@ -104,7 +104,7 @@ class MultilineExample::RenderTextView : public View { } private: - virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE { + virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) override { gfx::Rect bounds = GetLocalBounds(); bounds.Inset(GetInsets()); render_text_->SetDisplayRect(bounds); diff --git a/ui/views/examples/multiline_example.h b/ui/views/examples/multiline_example.h index 94f4770..8b0888c 100644 --- a/ui/views/examples/multiline_example.h +++ b/ui/views/examples/multiline_example.h @@ -26,17 +26,17 @@ class VIEWS_EXAMPLES_EXPORT MultilineExample : public ExampleBase, virtual ~MultilineExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; // ButtonListener: - virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; + virtual void ButtonPressed(Button* sender, const ui::Event& event) override; private: class RenderTextView; // TextfieldController: virtual void ContentsChanged(Textfield* sender, - const base::string16& new_contents) OVERRIDE; + const base::string16& new_contents) override; RenderTextView* render_text_view_; Label* label_; diff --git a/ui/views/examples/progress_bar_example.h b/ui/views/examples/progress_bar_example.h index 8533b7a..c3291d1 100644 --- a/ui/views/examples/progress_bar_example.h +++ b/ui/views/examples/progress_bar_example.h @@ -21,11 +21,11 @@ class VIEWS_EXAMPLES_EXPORT ProgressBarExample : public ExampleBase, virtual ~ProgressBarExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; private: // ButtonListener: - virtual void ButtonPressed(Button* button, const ui::Event& event) OVERRIDE; + virtual void ButtonPressed(Button* button, const ui::Event& event) override; Button* minus_button_; Button* plus_button_; diff --git a/ui/views/examples/radio_button_example.h b/ui/views/examples/radio_button_example.h index cc14522..844e315 100644 --- a/ui/views/examples/radio_button_example.h +++ b/ui/views/examples/radio_button_example.h @@ -25,11 +25,11 @@ class VIEWS_EXAMPLES_EXPORT RadioButtonExample : public ExampleBase, virtual ~RadioButtonExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; private: // ButtonListener: - virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; + virtual void ButtonPressed(Button* sender, const ui::Event& event) override; // Group of 3 radio buttons. RadioButton* radio_buttons_[3]; diff --git a/ui/views/examples/scroll_view_example.cc b/ui/views/examples/scroll_view_example.cc index 127442f..f6abfce 100644 --- a/ui/views/examples/scroll_view_example.cc +++ b/ui/views/examples/scroll_view_example.cc @@ -27,7 +27,7 @@ class ScrollViewExample::ScrollableView : public View { AddChildView(new RadioButton(ASCIIToUTF16("Radio Button"), 0)); } - virtual gfx::Size GetPreferredSize() const OVERRIDE { + virtual gfx::Size GetPreferredSize() const override { return gfx::Size(width(), height()); } @@ -41,7 +41,7 @@ class ScrollViewExample::ScrollableView : public View { view->SetBounds(0, y, size.width(), size.height()); } - virtual void Layout() OVERRIDE { + virtual void Layout() override { PlaceChildY(0, 0); PlaceChildY(1, height() / 2); SizeToPreferredSize(); diff --git a/ui/views/examples/scroll_view_example.h b/ui/views/examples/scroll_view_example.h index d850b01d..b3fd3bf 100644 --- a/ui/views/examples/scroll_view_example.h +++ b/ui/views/examples/scroll_view_example.h @@ -25,11 +25,11 @@ class VIEWS_EXAMPLES_EXPORT ScrollViewExample : public ExampleBase, virtual ~ScrollViewExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; private: // ButtonListener: - virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; + virtual void ButtonPressed(Button* sender, const ui::Event& event) override; // Control buttons to change the size of scrollable and jump to // predefined position. diff --git a/ui/views/examples/single_split_view_example.cc b/ui/views/examples/single_split_view_example.cc index 7e390b5..21dd88e 100644 --- a/ui/views/examples/single_split_view_example.cc +++ b/ui/views/examples/single_split_view_example.cc @@ -22,9 +22,9 @@ class SplittedView : public View { private: // View: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual gfx::Size GetMinimumSize() const OVERRIDE; - virtual void Layout() OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual gfx::Size GetMinimumSize() const override; + virtual void Layout() override; DISALLOW_COPY_AND_ASSIGN(SplittedView); }; diff --git a/ui/views/examples/single_split_view_example.h b/ui/views/examples/single_split_view_example.h index 603482c..b53c5c3 100644 --- a/ui/views/examples/single_split_view_example.h +++ b/ui/views/examples/single_split_view_example.h @@ -20,11 +20,11 @@ class VIEWS_EXAMPLES_EXPORT SingleSplitViewExample virtual ~SingleSplitViewExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; private: // SingleSplitViewListener: - virtual bool SplitHandleMoved(SingleSplitView* sender) OVERRIDE; + virtual bool SplitHandleMoved(SingleSplitView* sender) override; SingleSplitView* single_split_view_; diff --git a/ui/views/examples/slider_example.h b/ui/views/examples/slider_example.h index 32950f9..b27099b 100644 --- a/ui/views/examples/slider_example.h +++ b/ui/views/examples/slider_example.h @@ -21,14 +21,14 @@ class VIEWS_EXAMPLES_EXPORT SliderExample : public ExampleBase, virtual ~SliderExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; private: // SliderListener: virtual void SliderValueChanged(Slider* sender, float value, float old_value, - SliderChangeReason reason) OVERRIDE; + SliderChangeReason reason) override; Slider* slider_; Label* label_; diff --git a/ui/views/examples/tabbed_pane_example.h b/ui/views/examples/tabbed_pane_example.h index f23f6b3..a211a75 100644 --- a/ui/views/examples/tabbed_pane_example.h +++ b/ui/views/examples/tabbed_pane_example.h @@ -26,14 +26,14 @@ class VIEWS_EXAMPLES_EXPORT TabbedPaneExample : public ExampleBase, virtual ~TabbedPaneExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; private: // ButtonListener: - virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; + virtual void ButtonPressed(Button* sender, const ui::Event& event) override; // TabbedPaneListener: - virtual void TabSelectedAt(int index) OVERRIDE; + virtual void TabSelectedAt(int index) override; // Print the status of the tab in the status area. void PrintStatus(); diff --git a/ui/views/examples/table_example.h b/ui/views/examples/table_example.h index 06ac3c0..5f51316 100644 --- a/ui/views/examples/table_example.h +++ b/ui/views/examples/table_example.h @@ -36,25 +36,25 @@ class VIEWS_EXAMPLES_EXPORT TableExample : public ExampleBase, virtual ~TableExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; // ui::TableModel: - virtual int RowCount() OVERRIDE; - virtual base::string16 GetText(int row, int column_id) OVERRIDE; - virtual gfx::ImageSkia GetIcon(int row) OVERRIDE; - virtual void SetObserver(ui::TableModelObserver* observer) OVERRIDE; + virtual int RowCount() override; + virtual base::string16 GetText(int row, int column_id) override; + virtual gfx::ImageSkia GetIcon(int row) override; + virtual void SetObserver(ui::TableModelObserver* observer) override; // TableGrouper: - virtual void GetGroupRange(int model_index, GroupRange* range) OVERRIDE; + virtual void GetGroupRange(int model_index, GroupRange* range) override; // TableViewObserver: - virtual void OnSelectionChanged() OVERRIDE; - virtual void OnDoubleClick() OVERRIDE; - virtual void OnMiddleClick() OVERRIDE; - virtual void OnKeyDown(ui::KeyboardCode virtual_keycode) OVERRIDE; + virtual void OnSelectionChanged() override; + virtual void OnDoubleClick() override; + virtual void OnMiddleClick() override; + virtual void OnKeyDown(ui::KeyboardCode virtual_keycode) override; // ButtonListener: - virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; + virtual void ButtonPressed(Button* sender, const ui::Event& event) override; private: // The table to be tested. diff --git a/ui/views/examples/text_example.cc b/ui/views/examples/text_example.cc index 3145cfc..4dcf113 100644 --- a/ui/views/examples/text_example.cc +++ b/ui/views/examples/text_example.cc @@ -69,7 +69,7 @@ class TextExample::TextExampleView : public View { elide_(gfx::NO_ELIDE) { } - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { + virtual void OnPaint(gfx::Canvas* canvas) override { View::OnPaint(canvas); const gfx::Rect bounds = GetContentsBounds(); const SkColor color = SK_ColorDKGRAY; diff --git a/ui/views/examples/text_example.h b/ui/views/examples/text_example.h index 18ebaab..dd4bffc 100644 --- a/ui/views/examples/text_example.h +++ b/ui/views/examples/text_example.h @@ -27,7 +27,7 @@ class VIEWS_EXAMPLES_EXPORT TextExample : public ExampleBase, virtual ~TextExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; private: // Creates and adds a check box to the layout. @@ -40,10 +40,10 @@ class VIEWS_EXAMPLES_EXPORT TextExample : public ExampleBase, int count); // ButtonListener: - virtual void ButtonPressed(Button* button, const ui::Event& event) OVERRIDE; + virtual void ButtonPressed(Button* button, const ui::Event& event) override; // ComboboxListener: - virtual void OnPerformAction(Combobox* combobox) OVERRIDE; + virtual void OnPerformAction(Combobox* combobox) override; class TextExampleView; // The content of the scroll view. diff --git a/ui/views/examples/textfield_example.h b/ui/views/examples/textfield_example.h index db5e199..31aaaa9 100644 --- a/ui/views/examples/textfield_example.h +++ b/ui/views/examples/textfield_example.h @@ -27,19 +27,19 @@ class VIEWS_EXAMPLES_EXPORT TextfieldExample : public ExampleBase, virtual ~TextfieldExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; private: // TextfieldController: virtual void ContentsChanged(Textfield* sender, - const base::string16& new_contents) OVERRIDE; + const base::string16& new_contents) override; virtual bool HandleKeyEvent(Textfield* sender, - const ui::KeyEvent& key_event) OVERRIDE; + const ui::KeyEvent& key_event) override; virtual bool HandleMouseEvent(Textfield* sender, - const ui::MouseEvent& mouse_event) OVERRIDE; + const ui::MouseEvent& mouse_event) override; // ButtonListener: - virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; + virtual void ButtonPressed(Button* sender, const ui::Event& event) override; // Textfields for name and password. Textfield* name_; diff --git a/ui/views/examples/throbber_example.cc b/ui/views/examples/throbber_example.cc index 7bd18a2..51bbf3d 100644 --- a/ui/views/examples/throbber_example.cc +++ b/ui/views/examples/throbber_example.cc @@ -25,11 +25,11 @@ class ThrobberView : public View { throbber_->Start(); } - virtual gfx::Size GetPreferredSize() const OVERRIDE { + virtual gfx::Size GetPreferredSize() const override { return gfx::Size(width(), height()); } - virtual void Layout() OVERRIDE { + virtual void Layout() override { View* child = child_at(0); gfx::Size ps = child->GetPreferredSize(); child->SetBounds((width() - ps.width()) / 2, diff --git a/ui/views/examples/throbber_example.h b/ui/views/examples/throbber_example.h index 3c4f9c0..dcac287 100644 --- a/ui/views/examples/throbber_example.h +++ b/ui/views/examples/throbber_example.h @@ -17,7 +17,7 @@ class VIEWS_EXAMPLES_EXPORT ThrobberExample : public ExampleBase { virtual ~ThrobberExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; private: DISALLOW_COPY_AND_ASSIGN(ThrobberExample); diff --git a/ui/views/examples/tree_view_example.h b/ui/views/examples/tree_view_example.h index 55af17f..4678b2a 100644 --- a/ui/views/examples/tree_view_example.h +++ b/ui/views/examples/tree_view_example.h @@ -31,7 +31,7 @@ class VIEWS_EXAMPLES_EXPORT TreeViewExample virtual ~TreeViewExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; private: // IDs used by the context menu. @@ -48,24 +48,24 @@ class VIEWS_EXAMPLES_EXPORT TreeViewExample bool IsCommandIdEnabled(int command_id); // ButtonListener: - virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; + virtual void ButtonPressed(Button* sender, const ui::Event& event) override; // TreeViewController: - virtual void OnTreeViewSelectionChanged(TreeView* tree_view) OVERRIDE; - virtual bool CanEdit(TreeView* tree_view, ui::TreeModelNode* node) OVERRIDE; + virtual void OnTreeViewSelectionChanged(TreeView* tree_view) override; + virtual bool CanEdit(TreeView* tree_view, ui::TreeModelNode* node) override; // ContextMenuController: virtual void ShowContextMenuForView(View* source, const gfx::Point& point, - ui::MenuSourceType source_type) OVERRIDE; + ui::MenuSourceType source_type) override; // SimpleMenuModel::Delegate: - virtual bool IsCommandIdChecked(int command_id) const OVERRIDE; - virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE; + virtual bool IsCommandIdChecked(int command_id) const override; + virtual bool IsCommandIdEnabled(int command_id) const override; virtual bool GetAcceleratorForCommandId( int command_id, - ui::Accelerator* accelerator) OVERRIDE; - virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE; + ui::Accelerator* accelerator) override; + virtual void ExecuteCommand(int command_id, int event_flags) override; // The tree view to be tested. TreeView* tree_view_; diff --git a/ui/views/examples/webview_example.h b/ui/views/examples/webview_example.h index 3e35fe9..e55aced 100644 --- a/ui/views/examples/webview_example.h +++ b/ui/views/examples/webview_example.h @@ -23,7 +23,7 @@ class WebViewExample : public ExampleBase { virtual ~WebViewExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; private: WebView* webview_; diff --git a/ui/views/examples/widget_example.cc b/ui/views/examples/widget_example.cc index 1109a5a..2c061b7 100644 --- a/ui/views/examples/widget_example.cc +++ b/ui/views/examples/widget_example.cc @@ -24,10 +24,10 @@ class DialogExample : public DialogDelegateView { public: DialogExample(); virtual ~DialogExample(); - virtual base::string16 GetWindowTitle() const OVERRIDE; - virtual View* CreateExtraView() OVERRIDE; - virtual View* CreateTitlebarExtraView() OVERRIDE; - virtual View* CreateFootnoteView() OVERRIDE; + virtual base::string16 GetWindowTitle() const override; + virtual View* CreateExtraView() override; + virtual View* CreateTitlebarExtraView() override; + virtual View* CreateFootnoteView() override; }; DialogExample::DialogExample() { diff --git a/ui/views/examples/widget_example.h b/ui/views/examples/widget_example.h index ff08d70..44e1840 100644 --- a/ui/views/examples/widget_example.h +++ b/ui/views/examples/widget_example.h @@ -23,7 +23,7 @@ class VIEWS_EXAMPLES_EXPORT WidgetExample : public ExampleBase, virtual ~WidgetExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; private: // Button tags used to identify various commands. @@ -41,7 +41,7 @@ class VIEWS_EXAMPLES_EXPORT WidgetExample : public ExampleBase, void ShowWidget(View* sender, Widget::InitParams params); // ButtonListener: - virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; + virtual void ButtonPressed(Button* sender, const ui::Event& event) override; DISALLOW_COPY_AND_ASSIGN(WidgetExample); }; diff --git a/ui/views/focus/external_focus_tracker.h b/ui/views/focus/external_focus_tracker.h index e4d9172..3cfacb3 100644 --- a/ui/views/focus/external_focus_tracker.h +++ b/ui/views/focus/external_focus_tracker.h @@ -33,9 +33,9 @@ class VIEWS_EXPORT ExternalFocusTracker : public FocusChangeListener { // FocusChangeListener: virtual void OnWillChangeFocus(View* focused_before, - View* focused_now) OVERRIDE; + View* focused_now) override; virtual void OnDidChangeFocus(View* focused_before, - View* focused_now) OVERRIDE; + View* focused_now) override; // Focuses last focused view which is not a child of parent view and is not // parent view itself. Returns true if focus for a view was requested, false diff --git a/ui/views/focus/focus_manager_factory.cc b/ui/views/focus/focus_manager_factory.cc index 62770d7..bcbbfba6 100644 --- a/ui/views/focus/focus_manager_factory.cc +++ b/ui/views/focus/focus_manager_factory.cc @@ -18,7 +18,7 @@ class DefaultFocusManagerFactory : public FocusManagerFactory { protected: virtual FocusManager* CreateFocusManager(Widget* widget, - bool desktop_widget) OVERRIDE { + bool desktop_widget) override { return new FocusManager(widget, NULL /* delegate */); } diff --git a/ui/views/focus/focus_manager_unittest.cc b/ui/views/focus/focus_manager_unittest.cc index 289ed23..f6d9a43 100644 --- a/ui/views/focus/focus_manager_unittest.cc +++ b/ui/views/focus/focus_manager_unittest.cc @@ -48,11 +48,11 @@ class SimpleTestView : public View { set_id(view_id); } - virtual void OnFocus() OVERRIDE { + virtual void OnFocus() override { event_list_->push_back(FocusTestEvent(ON_FOCUS, id())); } - virtual void OnBlur() OVERRIDE { + virtual void OnBlur() override { event_list_->push_back(FocusTestEvent(ON_BLUR, id())); } @@ -165,12 +165,12 @@ class TestAcceleratorTarget : public ui::AcceleratorTarget { process_accelerator_(process_accelerator), can_handle_accelerators_(true) {} - virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE { + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) override { ++accelerator_count_; return process_accelerator_; } - virtual bool CanHandleAccelerators() const OVERRIDE { + virtual bool CanHandleAccelerators() const override { return can_handle_accelerators_; } @@ -425,13 +425,13 @@ class SelfUnregisteringAcceleratorTarget : public ui::AcceleratorTarget { accelerator_count_(0) { } - virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE { + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) override { ++accelerator_count_; focus_manager_->UnregisterAccelerator(accelerator, this); return true; } - virtual bool CanHandleAccelerators() const OVERRIDE { + virtual bool CanHandleAccelerators() const override { return true; } @@ -499,7 +499,7 @@ class FocusManagerDtorTest : public FocusManagerTest { } virtual FocusManager* CreateFocusManager(Widget* widget, - bool desktop_widget) OVERRIDE { + bool desktop_widget) override { return new FocusManagerDtorTracked(widget, dtor_tracker_); } @@ -568,7 +568,7 @@ class FocusInAboutToRequestFocusFromTabTraversalView : public View { void set_view_to_focus(View* view) { view_to_focus_ = view; } - virtual void AboutToRequestFocusFromTabTraversal(bool reverse) OVERRIDE { + virtual void AboutToRequestFocusFromTabTraversal(bool reverse) override { view_to_focus_->RequestFocus(); } @@ -706,13 +706,13 @@ class FocusManagerArrowKeyTraversalTest : public FocusManagerTest { virtual ~FocusManagerArrowKeyTraversalTest() {} // FocusManagerTest overrides: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { FocusManagerTest::SetUp(); previous_arrow_key_traversal_enabled_ = FocusManager::arrow_key_traversal_enabled(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { FocusManager::set_arrow_key_traversal_enabled( previous_arrow_key_traversal_enabled_); FocusManagerTest::TearDown(); @@ -786,7 +786,7 @@ class TextInputTestView : public View { public: TextInputTestView() {} - virtual ui::TextInputClient* GetTextInputClient() OVERRIDE { + virtual ui::TextInputClient* GetTextInputClient() override { return &text_input_client_; } @@ -852,11 +852,11 @@ class AdvanceFocusWidgetDelegate : public WidgetDelegate { } // WidgetDelegate overrides: - virtual bool ShouldAdvanceFocusToTopLevelWidget() const OVERRIDE { + virtual bool ShouldAdvanceFocusToTopLevelWidget() const override { return should_advance_focus_to_parent_; } - virtual Widget* GetWidget() OVERRIDE { return widget_; } - virtual const Widget* GetWidget() const OVERRIDE { return widget_; } + virtual Widget* GetWidget() override { return widget_; } + virtual const Widget* GetWidget() const override { return widget_; } private: Widget* widget_; diff --git a/ui/views/focus/focus_traversal_unittest.cc b/ui/views/focus/focus_traversal_unittest.cc index ea68b16..db55e9d 100644 --- a/ui/views/focus/focus_traversal_unittest.cc +++ b/ui/views/focus/focus_traversal_unittest.cc @@ -89,8 +89,8 @@ const int kThumbnailSuperStarID = count++; class DummyComboboxModel : public ui::ComboboxModel { public: // Overridden from ui::ComboboxModel: - virtual int GetItemCount() const OVERRIDE { return 10; } - virtual base::string16 GetItemAt(int index) OVERRIDE { + virtual int GetItemCount() const override { return 10; } + virtual base::string16 GetItemAt(int index) override { return ASCIIToUTF16("Item ") + base::IntToString16(index); } }; @@ -108,7 +108,7 @@ class PaneView : public View, public FocusTraversable { } // Overridden from View: - virtual FocusTraversable* GetPaneFocusTraversable() OVERRIDE { + virtual FocusTraversable* GetPaneFocusTraversable() override { if (focus_search_) return this; else @@ -116,13 +116,13 @@ class PaneView : public View, public FocusTraversable { } // Overridden from FocusTraversable: - virtual views::FocusSearch* GetFocusSearch() OVERRIDE { + virtual views::FocusSearch* GetFocusSearch() override { return focus_search_; } - virtual FocusTraversable* GetFocusTraversableParent() OVERRIDE { + virtual FocusTraversable* GetFocusTraversableParent() override { return NULL; } - virtual View* GetFocusTraversableParentView() OVERRIDE { + virtual View* GetFocusTraversableParentView() override { return NULL; } @@ -146,12 +146,12 @@ class BorderView : public NativeViewHost { return static_cast<internal::RootView*>(widget_->GetRootView()); } - virtual FocusTraversable* GetFocusTraversable() OVERRIDE { + virtual FocusTraversable* GetFocusTraversable() override { return static_cast<internal::RootView*>(widget_->GetRootView()); } virtual void ViewHierarchyChanged( - const ViewHierarchyChangedDetails& details) OVERRIDE { + const ViewHierarchyChangedDetails& details) override { NativeViewHost::ViewHierarchyChanged(details); if (details.child == this && details.is_add) { @@ -185,7 +185,7 @@ class FocusTraversalTest : public FocusManagerTest { public: virtual ~FocusTraversalTest(); - virtual void InitContentView() OVERRIDE; + virtual void InitContentView() override; protected: FocusTraversalTest(); diff --git a/ui/views/ime/input_method_base.h b/ui/views/ime/input_method_base.h index da454fb..4410796 100644 --- a/ui/views/ime/input_method_base.h +++ b/ui/views/ime/input_method_base.h @@ -29,16 +29,16 @@ class VIEWS_EXPORT InputMethodBase : public InputMethod, virtual ~InputMethodBase(); // Overridden from InputMethod. - virtual void SetDelegate(internal::InputMethodDelegate* delegate) OVERRIDE; - virtual void Init(Widget* widget) OVERRIDE; - virtual void OnTextInputTypeChanged(View* view) OVERRIDE; - virtual ui::TextInputClient* GetTextInputClient() const OVERRIDE; - virtual ui::TextInputType GetTextInputType() const OVERRIDE; - virtual bool IsMock() const OVERRIDE; + virtual void SetDelegate(internal::InputMethodDelegate* delegate) override; + virtual void Init(Widget* widget) override; + virtual void OnTextInputTypeChanged(View* view) override; + virtual ui::TextInputClient* GetTextInputClient() const override; + virtual ui::TextInputType GetTextInputType() const override; + virtual bool IsMock() const override; // Overridden from FocusChangeListener. - virtual void OnWillChangeFocus(View* focused_before, View* focused) OVERRIDE; - virtual void OnDidChangeFocus(View* focused_before, View* focused) OVERRIDE; + virtual void OnWillChangeFocus(View* focused_before, View* focused) override; + virtual void OnDidChangeFocus(View* focused_before, View* focused) override; protected: internal::InputMethodDelegate* delegate() const { return delegate_; } diff --git a/ui/views/ime/input_method_bridge.cc b/ui/views/ime/input_method_bridge.cc index 97b0400..8e321f0 100644 --- a/ui/views/ime/input_method_bridge.cc +++ b/ui/views/ime/input_method_bridge.cc @@ -24,16 +24,16 @@ class InputMethodBridge::HostObserver : public ui::InputMethodObserver { virtual ~HostObserver(); virtual void OnTextInputTypeChanged( - const ui::TextInputClient* client) OVERRIDE {} - virtual void OnFocus() OVERRIDE {} - virtual void OnBlur() OVERRIDE {} + const ui::TextInputClient* client) override {} + virtual void OnFocus() override {} + virtual void OnBlur() override {} virtual void OnCaretBoundsChanged( - const ui::TextInputClient* client) OVERRIDE {} + const ui::TextInputClient* client) override {} virtual void OnTextInputStateChanged( - const ui::TextInputClient* client) OVERRIDE {} + const ui::TextInputClient* client) override {} virtual void OnInputMethodDestroyed( - const ui::InputMethod* input_method) OVERRIDE; - virtual void OnShowImeIfNeeded() OVERRIDE {} + const ui::InputMethod* input_method) override; + virtual void OnShowImeIfNeeded() override {} private: InputMethodBridge* bridge_; diff --git a/ui/views/ime/input_method_bridge.h b/ui/views/ime/input_method_bridge.h index cdabecd..43fb947 100644 --- a/ui/views/ime/input_method_bridge.h +++ b/ui/views/ime/input_method_bridge.h @@ -35,56 +35,56 @@ class InputMethodBridge : public InputMethodBase, virtual ~InputMethodBridge(); // Overridden from InputMethod: - virtual void OnFocus() OVERRIDE; - virtual void OnBlur() OVERRIDE; + virtual void OnFocus() override; + virtual void OnBlur() override; virtual bool OnUntranslatedIMEMessage(const base::NativeEvent& event, - NativeEventResult* result) OVERRIDE; - virtual void DispatchKeyEvent(const ui::KeyEvent& key) OVERRIDE; - virtual void OnTextInputTypeChanged(View* view) OVERRIDE; - virtual void OnCaretBoundsChanged(View* view) OVERRIDE; - virtual void CancelComposition(View* view) OVERRIDE; - virtual void OnInputLocaleChanged() OVERRIDE; - virtual std::string GetInputLocale() OVERRIDE; - virtual bool IsActive() OVERRIDE; - virtual bool IsCandidatePopupOpen() const OVERRIDE; - virtual void ShowImeIfNeeded() OVERRIDE; + NativeEventResult* result) override; + virtual void DispatchKeyEvent(const ui::KeyEvent& key) override; + virtual void OnTextInputTypeChanged(View* view) override; + virtual void OnCaretBoundsChanged(View* view) override; + virtual void CancelComposition(View* view) override; + virtual void OnInputLocaleChanged() override; + virtual std::string GetInputLocale() override; + virtual bool IsActive() override; + virtual bool IsCandidatePopupOpen() const override; + virtual void ShowImeIfNeeded() override; // Overridden from TextInputClient: virtual void SetCompositionText( - const ui::CompositionText& composition) OVERRIDE; - virtual void ConfirmCompositionText() OVERRIDE; - virtual void ClearCompositionText() OVERRIDE; - virtual void InsertText(const base::string16& text) OVERRIDE; - virtual void InsertChar(base::char16 ch, int flags) OVERRIDE; - virtual gfx::NativeWindow GetAttachedWindow() const OVERRIDE; - virtual ui::TextInputType GetTextInputType() const OVERRIDE; - virtual ui::TextInputMode GetTextInputMode() const OVERRIDE; - virtual bool CanComposeInline() const OVERRIDE; - virtual gfx::Rect GetCaretBounds() const OVERRIDE; + const ui::CompositionText& composition) override; + virtual void ConfirmCompositionText() override; + virtual void ClearCompositionText() override; + virtual void InsertText(const base::string16& text) override; + virtual void InsertChar(base::char16 ch, int flags) override; + virtual gfx::NativeWindow GetAttachedWindow() const override; + virtual ui::TextInputType GetTextInputType() const override; + virtual ui::TextInputMode GetTextInputMode() const override; + virtual bool CanComposeInline() const override; + virtual gfx::Rect GetCaretBounds() const override; virtual bool GetCompositionCharacterBounds(uint32 index, - gfx::Rect* rect) const OVERRIDE; - virtual bool HasCompositionText() const OVERRIDE; - virtual bool GetTextRange(gfx::Range* range) const OVERRIDE; - virtual bool GetCompositionTextRange(gfx::Range* range) const OVERRIDE; - virtual bool GetSelectionRange(gfx::Range* range) const OVERRIDE; - virtual bool SetSelectionRange(const gfx::Range& range) OVERRIDE; - virtual bool DeleteRange(const gfx::Range& range) OVERRIDE; + gfx::Rect* rect) const override; + virtual bool HasCompositionText() const override; + virtual bool GetTextRange(gfx::Range* range) const override; + virtual bool GetCompositionTextRange(gfx::Range* range) const override; + virtual bool GetSelectionRange(gfx::Range* range) const override; + virtual bool SetSelectionRange(const gfx::Range& range) override; + virtual bool DeleteRange(const gfx::Range& range) override; virtual bool GetTextFromRange(const gfx::Range& range, - base::string16* text) const OVERRIDE; - virtual void OnInputMethodChanged() OVERRIDE; + base::string16* text) const override; + virtual void OnInputMethodChanged() override; virtual bool ChangeTextDirectionAndLayoutAlignment( - base::i18n::TextDirection direction) OVERRIDE; - virtual void ExtendSelectionAndDelete(size_t before, size_t after) OVERRIDE; - virtual void EnsureCaretInRect(const gfx::Rect& rect) OVERRIDE; - virtual void OnCandidateWindowShown() OVERRIDE; - virtual void OnCandidateWindowUpdated() OVERRIDE; - virtual void OnCandidateWindowHidden() OVERRIDE; - virtual bool IsEditingCommandEnabled(int command_id) OVERRIDE; - virtual void ExecuteEditingCommand(int command_id) OVERRIDE; + base::i18n::TextDirection direction) override; + virtual void ExtendSelectionAndDelete(size_t before, size_t after) override; + virtual void EnsureCaretInRect(const gfx::Rect& rect) override; + virtual void OnCandidateWindowShown() override; + virtual void OnCandidateWindowUpdated() override; + virtual void OnCandidateWindowHidden() override; + virtual bool IsEditingCommandEnabled(int command_id) override; + virtual void ExecuteEditingCommand(int command_id) override; // Overridden from FocusChangeListener. - virtual void OnWillChangeFocus(View* focused_before, View* focused) OVERRIDE; - virtual void OnDidChangeFocus(View* focused_before, View* focused) OVERRIDE; + virtual void OnWillChangeFocus(View* focused_before, View* focused) override; + virtual void OnDidChangeFocus(View* focused_before, View* focused) override; ui::InputMethod* GetHostInputMethod() const; diff --git a/ui/views/ime/mock_input_method.h b/ui/views/ime/mock_input_method.h index 013742c..e55c4df 100644 --- a/ui/views/ime/mock_input_method.h +++ b/ui/views/ime/mock_input_method.h @@ -23,21 +23,21 @@ class VIEWS_EXPORT MockInputMethod : public InputMethodBase { virtual ~MockInputMethod(); // Overridden from InputMethod: - virtual void Init(Widget* widget) OVERRIDE; - virtual void OnFocus() OVERRIDE; - virtual void OnBlur() OVERRIDE; + virtual void Init(Widget* widget) override; + virtual void OnFocus() override; + virtual void OnBlur() override; virtual bool OnUntranslatedIMEMessage(const base::NativeEvent& event, - NativeEventResult* result) OVERRIDE; - virtual void DispatchKeyEvent(const ui::KeyEvent& key) OVERRIDE; - virtual void OnTextInputTypeChanged(View* view) OVERRIDE; - virtual void OnCaretBoundsChanged(View* view) OVERRIDE; - virtual void CancelComposition(View* view) OVERRIDE; - virtual void OnInputLocaleChanged() OVERRIDE; - virtual std::string GetInputLocale() OVERRIDE; - virtual bool IsActive() OVERRIDE; - virtual bool IsCandidatePopupOpen() const OVERRIDE; - virtual void ShowImeIfNeeded() OVERRIDE; - virtual bool IsMock() const OVERRIDE; + NativeEventResult* result) override; + virtual void DispatchKeyEvent(const ui::KeyEvent& key) override; + virtual void OnTextInputTypeChanged(View* view) override; + virtual void OnCaretBoundsChanged(View* view) override; + virtual void CancelComposition(View* view) override; + virtual void OnInputLocaleChanged() override; + virtual std::string GetInputLocale() override; + virtual bool IsActive() override; + virtual bool IsCandidatePopupOpen() const override; + virtual void ShowImeIfNeeded() override; + virtual bool IsMock() const override; bool focus_changed() const { return focus_changed_; } bool untranslated_ime_message_called() const { @@ -59,7 +59,7 @@ class VIEWS_EXPORT MockInputMethod : public InputMethodBase { private: // Overridden from InputMethodBase. - virtual void OnWillChangeFocus(View* focused_before, View* focused) OVERRIDE; + virtual void OnWillChangeFocus(View* focused_before, View* focused) override; // Clears boolean states defined below. void ClearStates(); diff --git a/ui/views/ime/null_input_method.h b/ui/views/ime/null_input_method.h index 49234d3..29142e6 100644 --- a/ui/views/ime/null_input_method.h +++ b/ui/views/ime/null_input_method.h @@ -22,24 +22,24 @@ class NullInputMethod : public InputMethod { NullInputMethod(); // Overridden from InputMethod: - virtual void SetDelegate(internal::InputMethodDelegate* delegate) OVERRIDE; - virtual void Init(Widget* widget) OVERRIDE; - virtual void OnFocus() OVERRIDE; - virtual void OnBlur() OVERRIDE; + virtual void SetDelegate(internal::InputMethodDelegate* delegate) override; + virtual void Init(Widget* widget) override; + virtual void OnFocus() override; + virtual void OnBlur() override; virtual bool OnUntranslatedIMEMessage(const base::NativeEvent& event, - NativeEventResult* result) OVERRIDE; - virtual void DispatchKeyEvent(const ui::KeyEvent& key) OVERRIDE; - virtual void OnTextInputTypeChanged(View* view) OVERRIDE; - virtual void OnCaretBoundsChanged(View* view) OVERRIDE; - virtual void CancelComposition(View* view) OVERRIDE; - virtual void OnInputLocaleChanged() OVERRIDE; - virtual std::string GetInputLocale() OVERRIDE; - virtual bool IsActive() OVERRIDE; - virtual ui::TextInputClient* GetTextInputClient() const OVERRIDE; - virtual ui::TextInputType GetTextInputType() const OVERRIDE; - virtual bool IsCandidatePopupOpen() const OVERRIDE; - virtual void ShowImeIfNeeded() OVERRIDE; - virtual bool IsMock() const OVERRIDE; + NativeEventResult* result) override; + virtual void DispatchKeyEvent(const ui::KeyEvent& key) override; + virtual void OnTextInputTypeChanged(View* view) override; + virtual void OnCaretBoundsChanged(View* view) override; + virtual void CancelComposition(View* view) override; + virtual void OnInputLocaleChanged() override; + virtual std::string GetInputLocale() override; + virtual bool IsActive() override; + virtual ui::TextInputClient* GetTextInputClient() const override; + virtual ui::TextInputType GetTextInputType() const override; + virtual bool IsCandidatePopupOpen() const override; + virtual void ShowImeIfNeeded() override; + virtual bool IsMock() const override; private: DISALLOW_COPY_AND_ASSIGN(NullInputMethod); diff --git a/ui/views/layout/box_layout.h b/ui/views/layout/box_layout.h index 1bcbcf9..b07afaf 100644 --- a/ui/views/layout/box_layout.h +++ b/ui/views/layout/box_layout.h @@ -98,13 +98,13 @@ class VIEWS_EXPORT BoxLayout : public LayoutManager { void SetDefaultFlex(int default_flex); // Overridden from views::LayoutManager: - virtual void Installed(View* host) OVERRIDE; - virtual void Uninstalled(View* host) OVERRIDE; - virtual void ViewRemoved(View* host, View* view) OVERRIDE; - virtual void Layout(View* host) OVERRIDE; - virtual gfx::Size GetPreferredSize(const View* host) const OVERRIDE; + virtual void Installed(View* host) override; + virtual void Uninstalled(View* host) override; + virtual void ViewRemoved(View* host, View* view) override; + virtual void Layout(View* host) override; + virtual gfx::Size GetPreferredSize(const View* host) const override; virtual int GetPreferredHeightForWidth(const View* host, - int width) const OVERRIDE; + int width) const override; private: // Returns the flex for the specified |view|. diff --git a/ui/views/layout/box_layout_unittest.cc b/ui/views/layout/box_layout_unittest.cc index c5a5edd..708d2fe 100644 --- a/ui/views/layout/box_layout_unittest.cc +++ b/ui/views/layout/box_layout_unittest.cc @@ -14,7 +14,7 @@ namespace { class BoxLayoutTest : public testing::Test { public: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { host_.reset(new View); } diff --git a/ui/views/layout/fill_layout.h b/ui/views/layout/fill_layout.h index f50bde0..7496f7c 100644 --- a/ui/views/layout/fill_layout.h +++ b/ui/views/layout/fill_layout.h @@ -24,10 +24,10 @@ class VIEWS_EXPORT FillLayout : public LayoutManager { virtual ~FillLayout(); // Overridden from LayoutManager: - virtual void Layout(View* host) OVERRIDE; - virtual gfx::Size GetPreferredSize(const View* host) const OVERRIDE; + virtual void Layout(View* host) override; + virtual gfx::Size GetPreferredSize(const View* host) const override; virtual int GetPreferredHeightForWidth(const View* host, - int width) const OVERRIDE; + int width) const override; private: DISALLOW_COPY_AND_ASSIGN(FillLayout); diff --git a/ui/views/layout/grid_layout.cc b/ui/views/layout/grid_layout.cc index 7ab8108..99b39f2 100644 --- a/ui/views/layout/grid_layout.cc +++ b/ui/views/layout/grid_layout.cc @@ -178,7 +178,7 @@ class Column : public LayoutElement { GridLayout::Alignment h_align() { return h_align_; } GridLayout::Alignment v_align() { return v_align_; } - virtual void ResetSize() OVERRIDE; + virtual void ResetSize() override; private: friend class ColumnSet; @@ -190,7 +190,7 @@ class Column : public LayoutElement { // to that size. This should only be used for the master column. void UnifySameSizedColumnSizes(); - virtual void AdjustSize(int size) OVERRIDE; + virtual void AdjustSize(int size) override; const GridLayout::Alignment h_align_; const GridLayout::Alignment v_align_; @@ -269,7 +269,7 @@ class Row : public LayoutElement { virtual ~Row() {} - virtual void ResetSize() OVERRIDE { + virtual void ResetSize() override { max_ascent_ = max_descent_ = 0; SetSize(height_); } diff --git a/ui/views/layout/grid_layout.h b/ui/views/layout/grid_layout.h index ea578c8..ad228d5 100644 --- a/ui/views/layout/grid_layout.h +++ b/ui/views/layout/grid_layout.h @@ -162,26 +162,26 @@ class VIEWS_EXPORT GridLayout : public LayoutManager { // Notification we've been installed on a particular host. Checks that host // is the same as the View supplied in the constructor. - virtual void Installed(View* host) OVERRIDE; + virtual void Installed(View* host) override; // Notification we've been uninstalled on a particular host. Checks that host // is the same as the View supplied in the constructor. - virtual void Uninstalled(View* host) OVERRIDE; + virtual void Uninstalled(View* host) override; // Notification that a view has been added. - virtual void ViewAdded(View* host, View* view) OVERRIDE; + virtual void ViewAdded(View* host, View* view) override; // Notification that a view has been removed. - virtual void ViewRemoved(View* host, View* view) OVERRIDE; + virtual void ViewRemoved(View* host, View* view) override; // Layouts out the components. - virtual void Layout(View* host) OVERRIDE; + virtual void Layout(View* host) override; // Returns the preferred size for the GridLayout. - virtual gfx::Size GetPreferredSize(const View* host) const OVERRIDE; + virtual gfx::Size GetPreferredSize(const View* host) const override; virtual int GetPreferredHeightForWidth(const View* host, - int width) const OVERRIDE; + int width) const override; void set_minimum_size(const gfx::Size& size) { minimum_size_ = size; } diff --git a/ui/views/layout/grid_layout_unittest.cc b/ui/views/layout/grid_layout_unittest.cc index ea7d231..72f5053 100644 --- a/ui/views/layout/grid_layout_unittest.cc +++ b/ui/views/layout/grid_layout_unittest.cc @@ -24,7 +24,7 @@ class SettableSizeView : public View { pref_ = pref; } - virtual gfx::Size GetPreferredSize() const OVERRIDE { + virtual gfx::Size GetPreferredSize() const override { return pref_; } @@ -39,11 +39,11 @@ class FlexibleView : public View { circumference_ = circumference; } - virtual gfx::Size GetPreferredSize() const OVERRIDE { + virtual gfx::Size GetPreferredSize() const override { return gfx::Size(0, circumference_ / 2); } - virtual int GetHeightForWidth(int width) const OVERRIDE { + virtual int GetHeightForWidth(int width) const override { return std::max(0, circumference_ / 2 - width); } diff --git a/ui/views/linux_ui/window_button_order_provider.cc b/ui/views/linux_ui/window_button_order_provider.cc index 9032478..fa65cab 100644 --- a/ui/views/linux_ui/window_button_order_provider.cc +++ b/ui/views/linux_ui/window_button_order_provider.cc @@ -20,7 +20,7 @@ class WindowButtonOrderObserverDelegate : public WindowButtonOrderProvider, // WindowButtonOrderObserver: virtual void OnWindowButtonOrderingChange( const std::vector<views::FrameButton>& leading_buttons, - const std::vector<views::FrameButton>& trailing_buttons) OVERRIDE; + const std::vector<views::FrameButton>& trailing_buttons) override; private: DISALLOW_COPY_AND_ASSIGN(WindowButtonOrderObserverDelegate); }; diff --git a/ui/views/masked_targeter_delegate.h b/ui/views/masked_targeter_delegate.h index 548a364..ee8701c 100644 --- a/ui/views/masked_targeter_delegate.h +++ b/ui/views/masked_targeter_delegate.h @@ -32,7 +32,7 @@ class VIEWS_EXPORT MaskedTargeterDelegate : public ViewTargeterDelegate { // ViewTargeterDelegate: virtual bool DoesIntersectRect(const View* target, - const gfx::Rect& rect) const OVERRIDE; + const gfx::Rect& rect) const override; private: DISALLOW_COPY_AND_ASSIGN(MaskedTargeterDelegate); diff --git a/ui/views/mouse_watcher_aura.cc b/ui/views/mouse_watcher_aura.cc index 3793f0e..6fa463b 100644 --- a/ui/views/mouse_watcher_aura.cc +++ b/ui/views/mouse_watcher_aura.cc @@ -36,7 +36,7 @@ class MouseWatcher::Observer : public ui::EventHandler { } // ui::EventHandler implementation: - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE { + virtual void OnMouseEvent(ui::MouseEvent* event) override { switch (event->type()) { case ui::ET_MOUSE_MOVED: case ui::ET_MOUSE_DRAGGED: diff --git a/ui/views/mouse_watcher_view_host.h b/ui/views/mouse_watcher_view_host.h index f19aa8f..ada3444 100644 --- a/ui/views/mouse_watcher_view_host.h +++ b/ui/views/mouse_watcher_view_host.h @@ -23,7 +23,7 @@ class VIEWS_EXPORT MouseWatcherViewHost : public MouseWatcherHost { // MouseWatcherHost. virtual bool Contains(const gfx::Point& screen_point, - MouseEventType type) OVERRIDE; + MouseEventType type) override; private: bool IsCursorInViewZone(const gfx::Point& screen_point); diff --git a/ui/views/painter.cc b/ui/views/painter.cc index df67030..37a5a30 100644 --- a/ui/views/painter.cc +++ b/ui/views/painter.cc @@ -30,8 +30,8 @@ class DashedFocusPainter : public Painter { virtual ~DashedFocusPainter(); // Painter: - virtual gfx::Size GetMinimumSize() const OVERRIDE; - virtual void Paint(gfx::Canvas* canvas, const gfx::Size& size) OVERRIDE; + virtual gfx::Size GetMinimumSize() const override; + virtual void Paint(gfx::Canvas* canvas, const gfx::Size& size) override; private: const gfx::Insets insets_; @@ -64,8 +64,8 @@ class SolidFocusPainter : public Painter { virtual ~SolidFocusPainter(); // Painter: - virtual gfx::Size GetMinimumSize() const OVERRIDE; - virtual void Paint(gfx::Canvas* canvas, const gfx::Size& size) OVERRIDE; + virtual gfx::Size GetMinimumSize() const override; + virtual void Paint(gfx::Canvas* canvas, const gfx::Size& size) override; private: const SkColor color_; @@ -104,8 +104,8 @@ class GradientPainter : public Painter { virtual ~GradientPainter(); // Painter: - virtual gfx::Size GetMinimumSize() const OVERRIDE; - virtual void Paint(gfx::Canvas* canvas, const gfx::Size& size) OVERRIDE; + virtual gfx::Size GetMinimumSize() const override; + virtual void Paint(gfx::Canvas* canvas, const gfx::Size& size) override; private: // If |horizontal_| is true then the gradient is painted horizontally. @@ -175,8 +175,8 @@ class ImagePainter : public Painter { virtual ~ImagePainter(); // Painter: - virtual gfx::Size GetMinimumSize() const OVERRIDE; - virtual void Paint(gfx::Canvas* canvas, const gfx::Size& size) OVERRIDE; + virtual gfx::Size GetMinimumSize() const override; + virtual void Paint(gfx::Canvas* canvas, const gfx::Size& size) override; private: scoped_ptr<gfx::NineImagePainter> nine_painter_; diff --git a/ui/views/painter.h b/ui/views/painter.h index 6efd281..e703150 100644 --- a/ui/views/painter.h +++ b/ui/views/painter.h @@ -100,8 +100,8 @@ class VIEWS_EXPORT HorizontalPainter : public Painter { virtual ~HorizontalPainter(); // Painter: - virtual gfx::Size GetMinimumSize() const OVERRIDE; - virtual void Paint(gfx::Canvas* canvas, const gfx::Size& size) OVERRIDE; + virtual gfx::Size GetMinimumSize() const override; + virtual void Paint(gfx::Canvas* canvas, const gfx::Size& size) override; private: // The image chunks. diff --git a/ui/views/round_rect_painter.h b/ui/views/round_rect_painter.h index b7ee6cc..e498e8c 100644 --- a/ui/views/round_rect_painter.h +++ b/ui/views/round_rect_painter.h @@ -24,8 +24,8 @@ class VIEWS_EXPORT RoundRectPainter : public Painter { virtual ~RoundRectPainter(); // Painter: - virtual gfx::Size GetMinimumSize() const OVERRIDE; - virtual void Paint(gfx::Canvas* canvas, const gfx::Size& size) OVERRIDE; + virtual gfx::Size GetMinimumSize() const override; + virtual void Paint(gfx::Canvas* canvas, const gfx::Size& size) override; private: const SkColor border_color_; diff --git a/ui/views/run_all_unittests.cc b/ui/views/run_all_unittests.cc index e5d7b9d..bf7624c 100644 --- a/ui/views/run_all_unittests.cc +++ b/ui/views/run_all_unittests.cc @@ -18,7 +18,7 @@ class ViewTestSuite : public base::TestSuite { ViewTestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {} protected: - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { base::TestSuite::Initialize(); gfx::GLSurface::InitializeOneOffForTests(); ui::RegisterPathProvider(); @@ -28,7 +28,7 @@ class ViewTestSuite : public base::TestSuite { ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path); } - virtual void Shutdown() OVERRIDE { + virtual void Shutdown() override { ui::ResourceBundle::CleanupSharedInstance(); base::TestSuite::Shutdown(); } diff --git a/ui/views/shadow_border.h b/ui/views/shadow_border.h index 60439f5..b6aff3f 100644 --- a/ui/views/shadow_border.h +++ b/ui/views/shadow_border.h @@ -22,9 +22,9 @@ class VIEWS_EXPORT ShadowBorder : public views::Border { protected: // Overridden from views::Border: - virtual void Paint(const views::View& view, gfx::Canvas* canvas) OVERRIDE; - virtual gfx::Insets GetInsets() const OVERRIDE; - virtual gfx::Size GetMinimumSize() const OVERRIDE; + virtual void Paint(const views::View& view, gfx::Canvas* canvas) override; + virtual gfx::Insets GetInsets() const override; + virtual gfx::Size GetMinimumSize() const override; private: // Blur amount of the shadow in pixels. For details on how blur is defined see diff --git a/ui/views/test/capture_tracking_view.h b/ui/views/test/capture_tracking_view.h index fa914d1..a80cab0 100644 --- a/ui/views/test/capture_tracking_view.h +++ b/ui/views/test/capture_tracking_view.h @@ -26,8 +26,8 @@ class CaptureTrackingView : public views::View { void reset() { got_press_ = got_capture_lost_ = false; } // Overridden from views::View - virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseCaptureLost() OVERRIDE; + virtual bool OnMousePressed(const ui::MouseEvent& event) override; + virtual void OnMouseCaptureLost() override; private: // See description above getters. diff --git a/ui/views/test/desktop_test_views_delegate.h b/ui/views/test/desktop_test_views_delegate.h index 32f2ad7..26d24c2 100644 --- a/ui/views/test/desktop_test_views_delegate.h +++ b/ui/views/test/desktop_test_views_delegate.h @@ -19,7 +19,7 @@ class DesktopTestViewsDelegate : public TestViewsDelegate { // Overridden from ViewsDelegate: virtual void OnBeforeWidgetInit(Widget::InitParams* params, - internal::NativeWidgetDelegate* delegate) OVERRIDE; + internal::NativeWidgetDelegate* delegate) override; private: DISALLOW_COPY_AND_ASSIGN(DesktopTestViewsDelegate); diff --git a/ui/views/test/event_generator_delegate_mac.mm b/ui/views/test/event_generator_delegate_mac.mm index db94d34..d156aa5 100644 --- a/ui/views/test/event_generator_delegate_mac.mm +++ b/ui/views/test/event_generator_delegate_mac.mm @@ -243,47 +243,47 @@ class EventGeneratorDelegateMac : public ui::EventTarget, } // Overridden from ui::EventTarget: - virtual bool CanAcceptEvent(const ui::Event& event) OVERRIDE { return true; } - virtual ui::EventTarget* GetParentTarget() OVERRIDE { return NULL; } - virtual scoped_ptr<ui::EventTargetIterator> GetChildIterator() const OVERRIDE; - virtual ui::EventTargeter* GetEventTargeter() OVERRIDE { + virtual bool CanAcceptEvent(const ui::Event& event) override { return true; } + virtual ui::EventTarget* GetParentTarget() override { return NULL; } + virtual scoped_ptr<ui::EventTargetIterator> GetChildIterator() const override; + virtual ui::EventTargeter* GetEventTargeter() override { return this; } // Overridden from ui::EventHandler (via ui::EventTarget): - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; + virtual void OnMouseEvent(ui::MouseEvent* event) override; // Overridden from ui::EventSource: - virtual ui::EventProcessor* GetEventProcessor() OVERRIDE { return this; } + virtual ui::EventProcessor* GetEventProcessor() override { return this; } // Overridden from ui::EventProcessor: - virtual ui::EventTarget* GetRootTarget() OVERRIDE { return this; } + virtual ui::EventTarget* GetRootTarget() override { return this; } // Overridden from ui::EventDispatcherDelegate (via ui::EventProcessor): - virtual bool CanDispatchToTarget(EventTarget* target) OVERRIDE { + virtual bool CanDispatchToTarget(EventTarget* target) override { return true; } // Overridden from ui::test::EventGeneratorDelegate: virtual void SetContext(ui::test::EventGenerator* owner, gfx::NativeWindow root_window, - gfx::NativeWindow window) OVERRIDE; - virtual ui::EventTarget* GetTargetAt(const gfx::Point& location) OVERRIDE { + gfx::NativeWindow window) override; + virtual ui::EventTarget* GetTargetAt(const gfx::Point& location) override { return this; } - virtual ui::EventSource* GetEventSource(ui::EventTarget* target) OVERRIDE { + virtual ui::EventSource* GetEventSource(ui::EventTarget* target) override { return this; } virtual gfx::Point CenterOfTarget( - const ui::EventTarget* target) const OVERRIDE; - virtual gfx::Point CenterOfWindow(gfx::NativeWindow window) const OVERRIDE; + const ui::EventTarget* target) const override; + virtual gfx::Point CenterOfWindow(gfx::NativeWindow window) const override; virtual void ConvertPointFromTarget(const ui::EventTarget* target, - gfx::Point* point) const OVERRIDE {} + gfx::Point* point) const override {} virtual void ConvertPointToTarget(const ui::EventTarget* target, - gfx::Point* point) const OVERRIDE {} + gfx::Point* point) const override {} virtual void ConvertPointFromHost(const ui::EventTarget* hosted_target, - gfx::Point* point) const OVERRIDE {} + gfx::Point* point) const override {} private: friend struct DefaultSingletonTraits<EventGeneratorDelegateMac>; diff --git a/ui/views/test/focus_manager_test.h b/ui/views/test/focus_manager_test.h index 380d6f3..39184d2 100644 --- a/ui/views/test/focus_manager_test.h +++ b/ui/views/test/focus_manager_test.h @@ -23,14 +23,14 @@ class FocusManagerTest : public ViewsTestBase, public WidgetDelegate { FocusManager* GetFocusManager(); // Overridden from ViewsTestBase: - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; // Overridden from WidgetDelegate: - virtual View* GetContentsView() OVERRIDE; - virtual Widget* GetWidget() OVERRIDE; - virtual const Widget* GetWidget() const OVERRIDE; - virtual void GetAccessiblePanes(std::vector<View*>* panes) OVERRIDE; + virtual View* GetContentsView() override; + virtual Widget* GetWidget() override; + virtual const Widget* GetWidget() const override; + virtual void GetAccessiblePanes(std::vector<View*>* panes) override; protected: // Called after the Widget is initialized and the content view is added. @@ -65,9 +65,9 @@ class TestFocusChangeListener : public FocusChangeListener { // Overridden from FocusChangeListener: virtual void OnWillChangeFocus(View* focused_before, - View* focused_now) OVERRIDE; + View* focused_now) override; virtual void OnDidChangeFocus(View* focused_before, - View* focused_now) OVERRIDE; + View* focused_now) override; private: // A vector of which views lost/gained focus. @@ -91,7 +91,7 @@ class TestWidgetFocusChangeListener : public WidgetFocusChangeListener { // Overridden from WidgetFocusChangeListener: virtual void OnNativeFocusChange(gfx::NativeView focused_before, - gfx::NativeView focused_now) OVERRIDE; + gfx::NativeView focused_now) override; private: // Pairs of (focused_before, focused_now) parameters we've received via calls diff --git a/ui/views/test/test_views.h b/ui/views/test/test_views.h index be6f778..429e59f 100644 --- a/ui/views/test/test_views.h +++ b/ui/views/test/test_views.h @@ -16,7 +16,7 @@ class StaticSizedView : public View { explicit StaticSizedView(const gfx::Size& size); virtual ~StaticSizedView(); - virtual gfx::Size GetPreferredSize() const OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; private: gfx::Size size_; @@ -32,8 +32,8 @@ class ProportionallySizedView : public View { void set_preferred_width(int width) { preferred_width_ = width; } - virtual int GetHeightForWidth(int w) const OVERRIDE; - virtual gfx::Size GetPreferredSize() const OVERRIDE; + virtual int GetHeightForWidth(int w) const override; + virtual gfx::Size GetPreferredSize() const override; private: // The multiplicative factor between width and height, i.e. diff --git a/ui/views/test/test_views_delegate.h b/ui/views/test/test_views_delegate.h index 626bc79..20802e7 100644 --- a/ui/views/test/test_views_delegate.h +++ b/ui/views/test/test_views_delegate.h @@ -33,7 +33,7 @@ class TestViewsDelegate : public ViewsDelegate { // ViewsDelegate: virtual void OnBeforeWidgetInit( Widget::InitParams* params, - internal::NativeWidgetDelegate* delegate) OVERRIDE; + internal::NativeWidgetDelegate* delegate) override; private: bool use_desktop_native_widgets_; diff --git a/ui/views/test/test_widget_observer.h b/ui/views/test/test_widget_observer.h index 84bf185..064db84 100644 --- a/ui/views/test/test_widget_observer.h +++ b/ui/views/test/test_widget_observer.h @@ -24,7 +24,7 @@ class TestWidgetObserver : public WidgetObserver { private: // WidgetObserver overrides: - virtual void OnWidgetDestroying(Widget* widget) OVERRIDE; + virtual void OnWidgetDestroying(Widget* widget) override; Widget* widget_; diff --git a/ui/views/test/ui_controls_factory_desktop_aurax11.cc b/ui/views/test/ui_controls_factory_desktop_aurax11.cc index a7982bfb..201f884 100644 --- a/ui/views/test/ui_controls_factory_desktop_aurax11.cc +++ b/ui/views/test/ui_controls_factory_desktop_aurax11.cc @@ -77,7 +77,7 @@ class UIControlsDesktopX11 : public UIControlsAura { bool control, bool shift, bool alt, - bool command) OVERRIDE { + bool command) override { DCHECK(!command); // No command key on Aura return SendKeyPressNotifyWhenDone( window, key, control, shift, alt, command, base::Closure()); @@ -90,7 +90,7 @@ class UIControlsDesktopX11 : public UIControlsAura { bool shift, bool alt, bool command, - const base::Closure& closure) OVERRIDE { + const base::Closure& closure) override { DCHECK(!command); // No command key on Aura aura::WindowTreeHost* host = window->GetHost(); @@ -124,13 +124,13 @@ class UIControlsDesktopX11 : public UIControlsAura { return true; } - virtual bool SendMouseMove(long screen_x, long screen_y) OVERRIDE { + virtual bool SendMouseMove(long screen_x, long screen_y) override { return SendMouseMoveNotifyWhenDone(screen_x, screen_y, base::Closure()); } virtual bool SendMouseMoveNotifyWhenDone( long screen_x, long screen_y, - const base::Closure& closure) OVERRIDE { + const base::Closure& closure) override { gfx::Point screen_location(screen_x, screen_y); gfx::Point root_location = screen_location; aura::Window* root_window = RootWindowForPoint(screen_location); @@ -165,13 +165,13 @@ class UIControlsDesktopX11 : public UIControlsAura { RunClosureAfterAllPendingUIEvents(closure); return true; } - virtual bool SendMouseEvents(MouseButton type, int state) OVERRIDE { + virtual bool SendMouseEvents(MouseButton type, int state) override { return SendMouseEventsNotifyWhenDone(type, state, base::Closure()); } virtual bool SendMouseEventsNotifyWhenDone( MouseButton type, int state, - const base::Closure& closure) OVERRIDE { + const base::Closure& closure) override { XEvent xevent = {0}; XButtonEvent* xbutton = &xevent.xbutton; gfx::Point mouse_loc = aura::Env::GetInstance()->last_mouse_location(); @@ -211,11 +211,11 @@ class UIControlsDesktopX11 : public UIControlsAura { RunClosureAfterAllPendingUIEvents(closure); return true; } - virtual bool SendMouseClick(MouseButton type) OVERRIDE { + virtual bool SendMouseClick(MouseButton type) override { return SendMouseEvents(type, UP | DOWN); } virtual void RunClosureAfterAllPendingUIEvents( - const base::Closure& closure) OVERRIDE { + const base::Closure& closure) override { if (closure.is_null()) return; static XEvent* marker_event = NULL; diff --git a/ui/views/test/views_test_base.h b/ui/views/test/views_test_base.h index 6664cba..9339da3 100644 --- a/ui/views/test/views_test_base.h +++ b/ui/views/test/views_test_base.h @@ -27,8 +27,8 @@ class ViewsTestBase : public PlatformTest { virtual ~ViewsTestBase(); // testing::Test: - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; void RunPendingMessages(); diff --git a/ui/views/test/views_test_helper_aura.h b/ui/views/test/views_test_helper_aura.h index 77733bb..87d48ae 100644 --- a/ui/views/test/views_test_helper_aura.h +++ b/ui/views/test/views_test_helper_aura.h @@ -33,9 +33,9 @@ class ViewsTestHelperAura : public ViewsTestHelper { virtual ~ViewsTestHelperAura(); // Overridden from ViewsTestHelper: - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; - virtual gfx::NativeWindow GetContext() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; + virtual gfx::NativeWindow GetContext() override; private: ui::ContextFactory* context_factory_; diff --git a/ui/views/test/widget_test.h b/ui/views/test/widget_test.h index 1c06fac..dfeca47 100644 --- a/ui/views/test/widget_test.h +++ b/ui/views/test/widget_test.h @@ -51,9 +51,9 @@ class NativeWidgetCapture : public PlatformNativeWidget { explicit NativeWidgetCapture(internal::NativeWidgetDelegate* delegate); virtual ~NativeWidgetCapture(); - virtual void SetCapture() OVERRIDE; - virtual void ReleaseCapture() OVERRIDE; - virtual bool HasCapture() const OVERRIDE; + virtual void SetCapture() override; + virtual void ReleaseCapture() override; + virtual bool HasCapture() const override; private: bool mouse_capture_; diff --git a/ui/views/test/x11_property_change_waiter.h b/ui/views/test/x11_property_change_waiter.h index 366b9cb..af4ef71 100644 --- a/ui/views/test/x11_property_change_waiter.h +++ b/ui/views/test/x11_property_change_waiter.h @@ -37,8 +37,8 @@ class X11PropertyChangeWaiter : public ui::PlatformEventDispatcher { private: // ui::PlatformEventDispatcher: - virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE; - virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) OVERRIDE; + virtual bool CanDispatchEvent(const ui::PlatformEvent& event) override; + virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) override; XID x_window_; const char* property_; diff --git a/ui/views/touchui/touch_editing_menu.h b/ui/views/touchui/touch_editing_menu.h index 19f0d34..0dfff49 100644 --- a/ui/views/touchui/touch_editing_menu.h +++ b/ui/views/touchui/touch_editing_menu.h @@ -58,13 +58,13 @@ class VIEWS_EXPORT TouchEditingMenuView : public BubbleDelegateView, gfx::NativeView context); // views::WidgetDelegate overrides: - virtual void WindowClosing() OVERRIDE; + virtual void WindowClosing() override; // Overridden from ButtonListener. - virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; + virtual void ButtonPressed(Button* sender, const ui::Event& event) override; // Overridden from BubbleDelegateView. - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + virtual void OnPaint(gfx::Canvas* canvas) override; // Queries the |controller_| for what elements to show in the menu and sizes // the menu appropriately. diff --git a/ui/views/touchui/touch_selection_controller_impl.cc b/ui/views/touchui/touch_selection_controller_impl.cc index 4b09762..36b73d1 100644 --- a/ui/views/touchui/touch_selection_controller_impl.cc +++ b/ui/views/touchui/touch_selection_controller_impl.cc @@ -138,7 +138,7 @@ class TouchHandleWindowTargeter : public wm::MaskedWindowTargeter { private: // wm::MaskedWindowTargeter: virtual bool GetHitTestMask(aura::Window* window, - gfx::Path* mask) const OVERRIDE; + gfx::Path* mask) const override; EditingHandleView* handle_view_; @@ -170,11 +170,11 @@ class TouchSelectionControllerImpl::EditingHandleView } // Overridden from views::WidgetDelegateView: - virtual bool WidgetHasHitTestMask() const OVERRIDE { + virtual bool WidgetHasHitTestMask() const override { return true; } - virtual void GetWidgetHitTestMask(gfx::Path* mask) const OVERRIDE { + virtual void GetWidgetHitTestMask(gfx::Path* mask) const override { gfx::Size image_size = GetHandleImageSize(); mask->addRect(SkIntToScalar(0), SkIntToScalar(selection_rect_.height()), SkIntToScalar(image_size.width()) + 2 * kSelectionHandleHorizPadding, @@ -182,12 +182,12 @@ class TouchSelectionControllerImpl::EditingHandleView kSelectionHandleVertPadding)); } - virtual void DeleteDelegate() OVERRIDE { + virtual void DeleteDelegate() override { // We are owned and deleted by TouchSelectionController. } // Overridden from views::View: - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { + virtual void OnPaint(gfx::Canvas* canvas) override { if (draw_invisible_) return; gfx::Size image_size = GetHandleImageSize(); @@ -205,7 +205,7 @@ class TouchSelectionControllerImpl::EditingHandleView kSelectionHandleHorizPadding, selection_rect_.height()); } - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE { + virtual void OnGestureEvent(ui::GestureEvent* event) override { event->SetHandled(); switch (event->type()) { case ui::ET_GESTURE_SCROLL_BEGIN: @@ -230,7 +230,7 @@ class TouchSelectionControllerImpl::EditingHandleView } } - virtual gfx::Size GetPreferredSize() const OVERRIDE { + virtual gfx::Size GetPreferredSize() const override { gfx::Size image_size = GetHandleImageSize(); return gfx::Size(image_size.width() + 2 * kSelectionHandleHorizPadding, image_size.height() + selection_rect_.height() + diff --git a/ui/views/touchui/touch_selection_controller_impl.h b/ui/views/touchui/touch_selection_controller_impl.h index 353c949..158666c 100644 --- a/ui/views/touchui/touch_selection_controller_impl.h +++ b/ui/views/touchui/touch_selection_controller_impl.h @@ -37,9 +37,9 @@ class VIEWS_EXPORT TouchSelectionControllerImpl virtual ~TouchSelectionControllerImpl(); // TextSelectionController. - virtual void SelectionChanged() OVERRIDE; - virtual bool IsHandleDragInProgress() OVERRIDE; - virtual void HideHandles(bool quick) OVERRIDE; + virtual void SelectionChanged() override; + virtual bool IsHandleDragInProgress() override; + virtual void HideHandles(bool quick) override; private: friend class TouchSelectionControllerImplTest; @@ -65,26 +65,26 @@ class VIEWS_EXPORT TouchSelectionControllerImpl bool ShouldShowHandleFor(const gfx::Rect& rect) const; // Overridden from TouchEditingMenuController. - virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE; - virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE; - virtual void OpenContextMenu() OVERRIDE; - virtual void OnMenuClosed(TouchEditingMenuView* menu) OVERRIDE; + virtual bool IsCommandIdEnabled(int command_id) const override; + virtual void ExecuteCommand(int command_id, int event_flags) override; + virtual void OpenContextMenu() override; + virtual void OnMenuClosed(TouchEditingMenuView* menu) override; // Overriden from aura::WindowObserver. virtual void OnAncestorWindowTransformed(aura::Window* source, - aura::Window* window) OVERRIDE; + aura::Window* window) override; // Overridden from WidgetObserver. We will observe the widget backing the // |client_view_| so that when its moved/resized, we can update the selection // handles appropriately. - virtual void OnWidgetClosing(Widget* widget) OVERRIDE; + virtual void OnWidgetClosing(Widget* widget) override; virtual void OnWidgetBoundsChanged(Widget* widget, - const gfx::Rect& new_bounds) OVERRIDE; + const gfx::Rect& new_bounds) override; // Overriden from ui::EventHandler. - virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE; - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; - virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE; + virtual void OnKeyEvent(ui::KeyEvent* event) override; + virtual void OnMouseEvent(ui::MouseEvent* event) override; + virtual void OnScrollEvent(ui::ScrollEvent* event) override; // Time to show context menu. void ContextMenuTimerFired(); diff --git a/ui/views/touchui/touch_selection_controller_impl_unittest.cc b/ui/views/touchui/touch_selection_controller_impl_unittest.cc index b268d2c..214b3c7 100644 --- a/ui/views/touchui/touch_selection_controller_impl_unittest.cc +++ b/ui/views/touchui/touch_selection_controller_impl_unittest.cc @@ -575,59 +575,59 @@ class TestTouchEditable : public ui::TouchEditable { private: // Overridden from ui::TouchEditable. virtual void SelectRect( - const gfx::Point& start, const gfx::Point& end) OVERRIDE { + const gfx::Point& start, const gfx::Point& end) override { NOTREACHED(); } - virtual void MoveCaretTo(const gfx::Point& point) OVERRIDE { + virtual void MoveCaretTo(const gfx::Point& point) override { NOTREACHED(); } - virtual void GetSelectionEndPoints(gfx::Rect* p1, gfx::Rect* p2) OVERRIDE { + virtual void GetSelectionEndPoints(gfx::Rect* p1, gfx::Rect* p2) override { *p1 = *p2 = cursor_rect_; } - virtual gfx::Rect GetBounds() OVERRIDE { + virtual gfx::Rect GetBounds() override { return gfx::Rect(bounds_.size()); } - virtual gfx::NativeView GetNativeView() const OVERRIDE { + virtual gfx::NativeView GetNativeView() const override { return window_; } - virtual void ConvertPointToScreen(gfx::Point* point) OVERRIDE { + virtual void ConvertPointToScreen(gfx::Point* point) override { aura::client::ScreenPositionClient* screen_position_client = aura::client::GetScreenPositionClient(window_->GetRootWindow()); if (screen_position_client) screen_position_client->ConvertPointToScreen(window_, point); } - virtual void ConvertPointFromScreen(gfx::Point* point) OVERRIDE { + virtual void ConvertPointFromScreen(gfx::Point* point) override { aura::client::ScreenPositionClient* screen_position_client = aura::client::GetScreenPositionClient(window_->GetRootWindow()); if (screen_position_client) screen_position_client->ConvertPointFromScreen(window_, point); } - virtual bool DrawsHandles() OVERRIDE { + virtual bool DrawsHandles() override { return false; } - virtual void OpenContextMenu(const gfx::Point& anchor) OVERRIDE { + virtual void OpenContextMenu(const gfx::Point& anchor) override { NOTREACHED(); } - virtual void DestroyTouchSelection() OVERRIDE { + virtual void DestroyTouchSelection() override { NOTREACHED(); } // Overridden from ui::SimpleMenuModel::Delegate. - virtual bool IsCommandIdChecked(int command_id) const OVERRIDE { + virtual bool IsCommandIdChecked(int command_id) const override { NOTREACHED(); return false; } - virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE { + virtual bool IsCommandIdEnabled(int command_id) const override { NOTREACHED(); return false; } virtual bool GetAcceleratorForCommandId( int command_id, - ui::Accelerator* accelerator) OVERRIDE { + ui::Accelerator* accelerator) override { NOTREACHED(); return false; } - virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE { + virtual void ExecuteCommand(int command_id, int event_flags) override { NOTREACHED(); } @@ -733,18 +733,18 @@ class TestTouchEditingMenuController : public TouchEditingMenuController { virtual ~TestTouchEditingMenuController() {} // Overriden from TouchEditingMenuController. - virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE { + virtual bool IsCommandIdEnabled(int command_id) const override { // Return true, since we want the menu to have all |kMenuCommandCount| // available commands. return true; } - virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE { + virtual void ExecuteCommand(int command_id, int event_flags) override { NOTREACHED(); } - virtual void OpenContextMenu() OVERRIDE { + virtual void OpenContextMenu() override { NOTREACHED(); } - virtual void OnMenuClosed(TouchEditingMenuView* menu) OVERRIDE {} + virtual void OnMenuClosed(TouchEditingMenuView* menu) override {} private: DISALLOW_COPY_AND_ASSIGN(TestTouchEditingMenuController); diff --git a/ui/views/view.h b/ui/views/view.h index d9a0acf..5ae0c02 100644 --- a/ui/views/view.h +++ b/ui/views/view.h @@ -714,19 +714,19 @@ class VIEWS_EXPORT View : public ui::LayerDelegate, ViewTargeter* targeter() const { return targeter_.get(); } // Overridden from ui::EventTarget: - virtual bool CanAcceptEvent(const ui::Event& event) OVERRIDE; - virtual ui::EventTarget* GetParentTarget() OVERRIDE; - virtual scoped_ptr<ui::EventTargetIterator> GetChildIterator() const OVERRIDE; - virtual ui::EventTargeter* GetEventTargeter() OVERRIDE; + virtual bool CanAcceptEvent(const ui::Event& event) override; + virtual ui::EventTarget* GetParentTarget() override; + virtual scoped_ptr<ui::EventTargetIterator> GetChildIterator() const override; + virtual ui::EventTargeter* GetEventTargeter() override; virtual void ConvertEventToTarget(ui::EventTarget* target, - ui::LocatedEvent* event) OVERRIDE; + ui::LocatedEvent* event) override; // Overridden from ui::EventHandler: - virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE; - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; - virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE; - virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE FINAL; - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; + virtual void OnKeyEvent(ui::KeyEvent* event) override; + virtual void OnMouseEvent(ui::MouseEvent* event) override; + virtual void OnScrollEvent(ui::ScrollEvent* event) override; + virtual void OnTouchEvent(ui::TouchEvent* event) override final; + virtual void OnGestureEvent(ui::GestureEvent* event) override; // Accelerators -------------------------------------------------------------- @@ -744,12 +744,12 @@ class VIEWS_EXPORT View : public ui::LayerDelegate, virtual void ResetAccelerators(); // Overridden from AcceleratorTarget: - virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) override; // Returns whether accelerators are enabled for this view. Accelerators are // enabled if the containing widget is visible and the view is enabled() and // IsDrawn() - virtual bool CanHandleAccelerators() const OVERRIDE; + virtual bool CanHandleAccelerators() const override; // Focus --------------------------------------------------------------------- @@ -1117,11 +1117,11 @@ class VIEWS_EXPORT View : public ui::LayerDelegate, void UpdateChildLayerBounds(const gfx::Vector2d& offset); // Overridden from ui::LayerDelegate: - virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE; + virtual void OnPaintLayer(gfx::Canvas* canvas) override; virtual void OnDelegatedFrameDamage( - const gfx::Rect& damage_rect_in_dip) OVERRIDE; - virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE; - virtual base::Closure PrepareForLayerBoundsChange() OVERRIDE; + const gfx::Rect& damage_rect_in_dip) override; + virtual void OnDeviceScaleFactorChanged(float device_scale_factor) override; + virtual base::Closure PrepareForLayerBoundsChange() override; // Finds the layer that this view paints to (it may belong to an ancestor // view), then reorders the immediate children of that layer to match the diff --git a/ui/views/view_targeter.h b/ui/views/view_targeter.h index 79f5ca6..de87909 100644 --- a/ui/views/view_targeter.h +++ b/ui/views/view_targeter.h @@ -33,15 +33,15 @@ class VIEWS_EXPORT ViewTargeter : public ui::EventTargeter { protected: // ui::EventTargeter: virtual ui::EventTarget* FindTargetForEvent(ui::EventTarget* root, - ui::Event* event) OVERRIDE; + ui::Event* event) override; virtual ui::EventTarget* FindNextBestTarget(ui::EventTarget* previous_target, - ui::Event* event) OVERRIDE; + ui::Event* event) override; virtual bool SubtreeCanAcceptEvent( ui::EventTarget* target, - const ui::LocatedEvent& event) const OVERRIDE; + const ui::LocatedEvent& event) const override; virtual bool EventLocationInsideBounds( ui::EventTarget* target, - const ui::LocatedEvent& event) const OVERRIDE; + const ui::LocatedEvent& event) const override; private: // TODO(tdanderson): Un-friend RootView once RootView::DispatchGestureEvent() diff --git a/ui/views/view_targeter_unittest.cc b/ui/views/view_targeter_unittest.cc index 15d65ad..a3acb46 100644 --- a/ui/views/view_targeter_unittest.cc +++ b/ui/views/view_targeter_unittest.cc @@ -34,7 +34,7 @@ class TestingView : public View, public ViewTargeterDelegate { } // View: - virtual bool CanProcessEventsWithinSubtree() const OVERRIDE { + virtual bool CanProcessEventsWithinSubtree() const override { return can_process_events_within_subtree_; } @@ -58,7 +58,7 @@ class TestMaskedView : public View, public MaskedTargeterDelegate { private: // MaskedTargeterDelegate: - virtual bool GetHitTestMask(gfx::Path* mask) const OVERRIDE { + virtual bool GetHitTestMask(gfx::Path* mask) const override { DCHECK(mask); SkScalar w = SkIntToScalar(width()); SkScalar h = SkIntToScalar(height()); diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc index 97b1643..123b538 100644 --- a/ui/views/view_unittest.cc +++ b/ui/views/view_unittest.cc @@ -219,23 +219,23 @@ class TestView : public View { can_process_events_within_subtree_ = can_process; } - virtual bool CanProcessEventsWithinSubtree() const OVERRIDE { + virtual bool CanProcessEventsWithinSubtree() const override { return can_process_events_within_subtree_; } - virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE; - virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; - virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE; + virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) override; + virtual bool OnMousePressed(const ui::MouseEvent& event) override; + virtual bool OnMouseDragged(const ui::MouseEvent& event) override; + virtual void OnMouseReleased(const ui::MouseEvent& event) override; + virtual void OnMouseEntered(const ui::MouseEvent& event) override; + virtual void OnMouseExited(const ui::MouseEvent& event) override; - virtual void Paint(gfx::Canvas* canvas, const CullSet& cull_set) OVERRIDE; - virtual void SchedulePaintInRect(const gfx::Rect& rect) OVERRIDE; - virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; + virtual void Paint(gfx::Canvas* canvas, const CullSet& cull_set) override; + virtual void SchedulePaintInRect(const gfx::Rect& rect) override; + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) override; virtual void OnNativeThemeChanged(const ui::NativeTheme* native_theme) - OVERRIDE; + override; // OnBoundsChanged. bool did_change_bounds_; @@ -1495,14 +1495,14 @@ class ToplevelWidgetObserverView : public View { // View overrides: virtual void ViewHierarchyChanged( - const ViewHierarchyChangedDetails& details) OVERRIDE { + const ViewHierarchyChangedDetails& details) override { if (details.is_add) { toplevel_ = GetWidget() ? GetWidget()->GetTopLevelWidget() : NULL; } else { toplevel_ = NULL; } } - virtual void NativeViewHierarchyChanged() OVERRIDE { + virtual void NativeViewHierarchyChanged() override { toplevel_ = GetWidget() ? GetWidget()->GetTopLevelWidget() : NULL; } @@ -1569,7 +1569,7 @@ class TransformPaintView : public TestView { gfx::Rect scheduled_paint_rect() const { return scheduled_paint_rect_; } // Overridden from View: - virtual void SchedulePaintInRect(const gfx::Rect& rect) OVERRIDE { + virtual void SchedulePaintInRect(const gfx::Rect& rect) override { gfx::Rect xrect = ConvertRectToParent(rect); scheduled_paint_rect_.Union(xrect); } @@ -1808,10 +1808,10 @@ class VisibleBoundsView : public View { private: // Overridden from View: - virtual bool GetNeedsNotificationWhenVisibleBoundsChange() const OVERRIDE { + virtual bool GetNeedsNotificationWhenVisibleBoundsChange() const override { return true; } - virtual void OnVisibleBoundsChanged() OVERRIDE { + virtual void OnVisibleBoundsChanged() override { received_notification_ = true; } @@ -2233,7 +2233,7 @@ class ObserverView : public View { private: // View: virtual void ViewHierarchyChanged( - const ViewHierarchyChangedDetails& details) OVERRIDE; + const ViewHierarchyChangedDetails& details) override; bool has_add_details_; bool has_remove_details_; @@ -2652,7 +2652,7 @@ class ActiveWidget : public Widget { ActiveWidget() {} virtual ~ActiveWidget() {} - virtual bool IsActive() const OVERRIDE { + virtual bool IsActive() const override { return true; } @@ -2718,7 +2718,7 @@ class TestLayerAnimator : public ui::LayerAnimator { const gfx::Rect& last_bounds() const { return last_bounds_; } // LayerAnimator. - virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; + virtual void SetBounds(const gfx::Rect& bounds) override; protected: virtual ~TestLayerAnimator() { } @@ -2751,7 +2751,7 @@ class ViewLayerTest : public ViewsTestBase { return widget()->GetLayer(); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ViewTest::SetUp(); widget_ = new Widget; Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP); @@ -2761,7 +2761,7 @@ class ViewLayerTest : public ViewsTestBase { widget_->GetRootView()->SetBounds(0, 0, 200, 200); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { widget_->CloseNow(); ViewsTestBase::TearDown(); } @@ -3070,7 +3070,7 @@ class PaintTrackingView : public View { bool painted() const { return painted_; } void set_painted(bool value) { painted_ = value; } - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { + virtual void OnPaint(gfx::Canvas* canvas) override { painted_ = true; } @@ -3312,7 +3312,7 @@ class BoundsTreeTestView : public View { BoundsTreeTestView() {} virtual void PaintChildren(gfx::Canvas* canvas, - const CullSet& cull_set) OVERRIDE { + const CullSet& cull_set) override { // Save out a copy of the cull_set before calling the base implementation. last_cull_set_.clear(); if (cull_set.cull_set_) { diff --git a/ui/views/views_touch_selection_controller_factory.h b/ui/views/views_touch_selection_controller_factory.h index 6b02c1e..9ddaa8f 100644 --- a/ui/views/views_touch_selection_controller_factory.h +++ b/ui/views/views_touch_selection_controller_factory.h @@ -17,7 +17,7 @@ class VIEWS_EXPORT ViewsTouchSelectionControllerFactory // Overridden from ui::TouchSelectionControllerFactory. virtual ui::TouchSelectionController* create( - ui::TouchEditable* client_view) OVERRIDE; + ui::TouchEditable* client_view) override; }; } // namespace views diff --git a/ui/views/widget/desktop_aura/desktop_capture_client.h b/ui/views/widget/desktop_aura/desktop_capture_client.h index 24d2029..26c21d9 100644 --- a/ui/views/widget/desktop_aura/desktop_capture_client.h +++ b/ui/views/widget/desktop_aura/desktop_capture_client.h @@ -38,10 +38,10 @@ class VIEWS_EXPORT DesktopCaptureClient : public aura::client::CaptureClient { virtual ~DesktopCaptureClient(); // Overridden from aura::client::CaptureClient: - virtual void SetCapture(aura::Window* window) OVERRIDE; - virtual void ReleaseCapture(aura::Window* window) OVERRIDE; - virtual aura::Window* GetCaptureWindow() OVERRIDE; - virtual aura::Window* GetGlobalCaptureWindow() OVERRIDE; + virtual void SetCapture(aura::Window* window) override; + virtual void ReleaseCapture(aura::Window* window) override; + virtual aura::Window* GetCaptureWindow() override; + virtual aura::Window* GetGlobalCaptureWindow() override; private: typedef std::set<DesktopCaptureClient*> CaptureClients; diff --git a/ui/views/widget/desktop_aura/desktop_cursor_loader_updater_auralinux.h b/ui/views/widget/desktop_aura/desktop_cursor_loader_updater_auralinux.h index c367518..3b496f9 100644 --- a/ui/views/widget/desktop_aura/desktop_cursor_loader_updater_auralinux.h +++ b/ui/views/widget/desktop_aura/desktop_cursor_loader_updater_auralinux.h @@ -18,9 +18,9 @@ class DesktopCursorLoaderUpdaterAuraLinux : public DesktopCursorLoaderUpdater { // Overridden from DesktopCursorLoaderUpdater: virtual void OnCreate(float device_scale_factor, - ui::CursorLoader* loader) OVERRIDE; + ui::CursorLoader* loader) override; virtual void OnDisplayUpdated(const gfx::Display& display, - ui::CursorLoader* loader) OVERRIDE; + ui::CursorLoader* loader) override; }; } // namespace views diff --git a/ui/views/widget/desktop_aura/desktop_dispatcher_client.h b/ui/views/widget/desktop_aura/desktop_dispatcher_client.h index 284e81c..5e5ec01 100644 --- a/ui/views/widget/desktop_aura/desktop_dispatcher_client.h +++ b/ui/views/widget/desktop_aura/desktop_dispatcher_client.h @@ -22,7 +22,7 @@ class VIEWS_EXPORT DesktopDispatcherClient virtual void PrepareNestedLoopClosures( base::MessagePumpDispatcher* dispatcher, base::Closure* run_closure, - base::Closure* quit_closure) OVERRIDE; + base::Closure* quit_closure) override; private: DISALLOW_COPY_AND_ASSIGN(DesktopDispatcherClient); diff --git a/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc b/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc index 5dbc2b5d..ed7059a 100644 --- a/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc +++ b/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc @@ -144,8 +144,8 @@ class DesktopDragDropClientAuraX11::X11DragContext void MaskOperation(::Atom xdnd_operation, int* drag_operation) const; // ui::PlatformEventDispatcher: - virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE; - virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) OVERRIDE; + virtual bool CanDispatchEvent(const ui::PlatformEvent& event) override; + virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) override; // The atom cache owned by our parent. ui::X11AtomCache* atom_cache_; diff --git a/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h b/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h index 8d30153..02d64c1 100644 --- a/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h +++ b/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h @@ -86,21 +86,21 @@ class VIEWS_EXPORT DesktopDragDropClientAuraX11 aura::Window* source_window, const gfx::Point& root_location, int operation, - ui::DragDropTypes::DragEventSource source) OVERRIDE; + ui::DragDropTypes::DragEventSource source) override; virtual void DragUpdate(aura::Window* target, - const ui::LocatedEvent& event) OVERRIDE; + const ui::LocatedEvent& event) override; virtual void Drop(aura::Window* target, - const ui::LocatedEvent& event) OVERRIDE; - virtual void DragCancel() OVERRIDE; - virtual bool IsDragDropInProgress() OVERRIDE; + const ui::LocatedEvent& event) override; + virtual void DragCancel() override; + virtual bool IsDragDropInProgress() override; // Overridden from aura::WindowObserver: - virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; + virtual void OnWindowDestroyed(aura::Window* window) override; // Overridden from X11WholeScreenMoveLoopDelegate: - virtual void OnMouseMovement(XMotionEvent* event) OVERRIDE; - virtual void OnMouseReleased() OVERRIDE; - virtual void OnMoveLoopEnded() OVERRIDE; + virtual void OnMouseMovement(XMotionEvent* event) override; + virtual void OnMouseReleased() override; + virtual void OnMoveLoopEnded() override; protected: // The following methods are virtual for the sake of testing. diff --git a/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11_unittest.cc b/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11_unittest.cc index 1008289..f69d27c 100644 --- a/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11_unittest.cc +++ b/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11_unittest.cc @@ -87,9 +87,9 @@ class TestMoveLoop : public X11MoveLoop { // X11MoveLoop: virtual bool RunMoveLoop(aura::Window* window, - gfx::NativeCursor cursor) OVERRIDE; - virtual void UpdateCursor(gfx::NativeCursor cursor) OVERRIDE; - virtual void EndMoveLoop() OVERRIDE; + gfx::NativeCursor cursor) override; + virtual void UpdateCursor(gfx::NativeCursor cursor) override; + virtual void EndMoveLoop() override; private: // Not owned. @@ -153,9 +153,9 @@ class TestDragDropClient : public DesktopDragDropClientAuraX11 { private: // DesktopDragDropClientAuraX11: virtual scoped_ptr<X11MoveLoop> CreateMoveLoop( - X11MoveLoopDelegate* delegate) OVERRIDE; - virtual ::Window FindWindowFor(const gfx::Point& screen_point) OVERRIDE; - virtual void SendXClientEvent(::Window xid, XEvent* event) OVERRIDE; + X11MoveLoopDelegate* delegate) override; + virtual ::Window FindWindowFor(const gfx::Point& screen_point) override; + virtual void SendXClientEvent(::Window xid, XEvent* event) override; // The XID of the window which initiated the drag. ::Window source_xid_; @@ -366,7 +366,7 @@ class DesktopDragDropClientAuraX11Test : public ViewsTestBase { } // ViewsTestBase: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ViewsTestBase::SetUp(); // Create widget to initiate the drags. @@ -386,7 +386,7 @@ class DesktopDragDropClientAuraX11Test : public ViewsTestBase { client_->Init(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { client_.reset(); cursor_manager_.reset(); widget_.reset(); diff --git a/ui/views/widget/desktop_aura/desktop_drag_drop_client_win.h b/ui/views/widget/desktop_aura/desktop_drag_drop_client_win.h index a8051ca..0da14e0 100644 --- a/ui/views/widget/desktop_aura/desktop_drag_drop_client_win.h +++ b/ui/views/widget/desktop_aura/desktop_drag_drop_client_win.h @@ -30,13 +30,13 @@ class VIEWS_EXPORT DesktopDragDropClientWin aura::Window* source_window, const gfx::Point& root_location, int operation, - ui::DragDropTypes::DragEventSource source) OVERRIDE; + ui::DragDropTypes::DragEventSource source) override; virtual void DragUpdate(aura::Window* target, - const ui::LocatedEvent& event) OVERRIDE; + const ui::LocatedEvent& event) override; virtual void Drop(aura::Window* target, - const ui::LocatedEvent& event) OVERRIDE; - virtual void DragCancel() OVERRIDE; - virtual bool IsDragDropInProgress() OVERRIDE; + const ui::LocatedEvent& event) override; + virtual void DragCancel() override; + virtual bool IsDragDropInProgress() override; void OnNativeWidgetDestroying(HWND window); diff --git a/ui/views/widget/desktop_aura/desktop_drop_target_win.h b/ui/views/widget/desktop_aura/desktop_drop_target_win.h index 9e11ff6..d376182 100644 --- a/ui/views/widget/desktop_aura/desktop_drop_target_win.h +++ b/ui/views/widget/desktop_aura/desktop_drop_target_win.h @@ -36,19 +36,19 @@ class DesktopDropTargetWin : public ui::DropTargetWin, virtual DWORD OnDragEnter(IDataObject* data_object, DWORD key_state, POINT position, - DWORD effect) OVERRIDE; + DWORD effect) override; virtual DWORD OnDragOver(IDataObject* data_object, DWORD key_state, POINT position, - DWORD effect) OVERRIDE; - virtual void OnDragLeave(IDataObject* data_object) OVERRIDE; + DWORD effect) override; + virtual void OnDragLeave(IDataObject* data_object) override; virtual DWORD OnDrop(IDataObject* data_object, DWORD key_state, POINT position, - DWORD effect) OVERRIDE; + DWORD effect) override; // aura::WindowObserver implementation: - virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; + virtual void OnWindowDestroyed(aura::Window* window) override; // Common functionality for the ui::DropTargetWin methods to translate from // COM data types to Aura ones. diff --git a/ui/views/widget/desktop_aura/desktop_event_client.h b/ui/views/widget/desktop_aura/desktop_event_client.h index d16b5c9..92bde0d 100644 --- a/ui/views/widget/desktop_aura/desktop_event_client.h +++ b/ui/views/widget/desktop_aura/desktop_event_client.h @@ -19,8 +19,8 @@ class VIEWS_EXPORT DesktopEventClient : public aura::client::EventClient { // Overridden from aura::client::EventClient: virtual bool CanProcessEventsWithinSubtree( - const aura::Window* window) const OVERRIDE; - virtual ui::EventTarget* GetToplevelEventTarget() OVERRIDE; + const aura::Window* window) const override; + virtual ui::EventTarget* GetToplevelEventTarget() override; private: DISALLOW_COPY_AND_ASSIGN(DesktopEventClient); diff --git a/ui/views/widget/desktop_aura/desktop_focus_rules.h b/ui/views/widget/desktop_aura/desktop_focus_rules.h index e096e80..a1f32e1 100644 --- a/ui/views/widget/desktop_aura/desktop_focus_rules.h +++ b/ui/views/widget/desktop_aura/desktop_focus_rules.h @@ -16,13 +16,13 @@ class DesktopFocusRules : public wm::BaseFocusRules { private: // Overridden from wm::BaseFocusRules: - virtual bool CanActivateWindow(aura::Window* window) const OVERRIDE; - virtual bool SupportsChildActivation(aura::Window* window) const OVERRIDE; + virtual bool CanActivateWindow(aura::Window* window) const override; + virtual bool SupportsChildActivation(aura::Window* window) const override; virtual bool IsWindowConsideredVisibleForActivation( - aura::Window* window) const OVERRIDE; - virtual aura::Window* GetToplevelWindow(aura::Window* window) const OVERRIDE; + aura::Window* window) const override; + virtual aura::Window* GetToplevelWindow(aura::Window* window) const override; virtual aura::Window* GetNextActivatableWindow( - aura::Window* window) const OVERRIDE; + aura::Window* window) const override; // The content window. This is an activatable window even though it is a // child. diff --git a/ui/views/widget/desktop_aura/desktop_native_cursor_manager.h b/ui/views/widget/desktop_aura/desktop_native_cursor_manager.h index ee15634..8dbfcfb 100644 --- a/ui/views/widget/desktop_aura/desktop_native_cursor_manager.h +++ b/ui/views/widget/desktop_aura/desktop_native_cursor_manager.h @@ -50,19 +50,19 @@ class VIEWS_EXPORT DesktopNativeCursorManager // Overridden from wm::NativeCursorManager: virtual void SetDisplay( const gfx::Display& display, - wm::NativeCursorManagerDelegate* delegate) OVERRIDE; + wm::NativeCursorManagerDelegate* delegate) override; virtual void SetCursor( gfx::NativeCursor cursor, - wm::NativeCursorManagerDelegate* delegate) OVERRIDE; + wm::NativeCursorManagerDelegate* delegate) override; virtual void SetVisibility( bool visible, - wm::NativeCursorManagerDelegate* delegate) OVERRIDE; + wm::NativeCursorManagerDelegate* delegate) override; virtual void SetCursorSet( ui::CursorSetType cursor_set, - wm::NativeCursorManagerDelegate* delegate) OVERRIDE; + wm::NativeCursorManagerDelegate* delegate) override; virtual void SetMouseEventsEnabled( bool enabled, - wm::NativeCursorManagerDelegate* delegate) OVERRIDE; + wm::NativeCursorManagerDelegate* delegate) override; // The set of hosts to notify of changes in cursor state. typedef std::set<aura::WindowTreeHost*> Hosts; diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc index 5dae218..2ddbf72 100644 --- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc +++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc @@ -118,7 +118,7 @@ class DesktopNativeWidgetTopLevelHandler : public aura::WindowObserver { } // aura::WindowObserver overrides - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE { + virtual void OnWindowDestroying(aura::Window* window) override { window->RemoveObserver(this); // If the widget is being destroyed by the OS then we should not try and @@ -143,7 +143,7 @@ class DesktopNativeWidgetTopLevelHandler : public aura::WindowObserver { virtual void OnWindowBoundsChanged(aura::Window* window, const gfx::Rect& old_bounds, - const gfx::Rect& new_bounds) OVERRIDE { + const gfx::Rect& new_bounds) override { if (top_level_widget_ && window == child_window_) top_level_widget_->SetSize(new_bounds.size()); } @@ -176,7 +176,7 @@ class DesktopNativeWidgetAuraWindowTreeClient : // Overridden from client::WindowTreeClient: virtual aura::Window* GetDefaultParent(aura::Window* context, aura::Window* window, - const gfx::Rect& bounds) OVERRIDE { + const gfx::Rect& bounds) override { bool is_fullscreen = window->GetProperty(aura::client::kShowStateKey) == ui::SHOW_STATE_FULLSCREEN; bool is_menu = window->type() == ui::wm::WINDOW_TYPE_MENU; @@ -208,7 +208,7 @@ class FocusManagerEventHandler : public ui::EventHandler { : desktop_native_widget_aura_(desktop_native_widget_aura) {} // Implementation of ui::EventHandler: - virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE { + virtual void OnKeyEvent(ui::KeyEvent* event) override { Widget* widget = desktop_native_widget_aura_->GetWidget(); if (widget && widget->GetFocusManager()->GetFocusedView() && !widget->GetFocusManager()->OnKeyEvent(*event)) { @@ -230,7 +230,7 @@ class RootWindowDestructionObserver : public aura::WindowObserver { private: // Overridden from aura::WindowObserver: - virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE { + virtual void OnWindowDestroyed(aura::Window* window) override { parent_->RootWindowDestroyed(); window->RemoveObserver(this); delete this; diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.h b/ui/views/widget/desktop_aura/desktop_native_widget_aura.h index b4383c8..6b8d93d 100644 --- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.h +++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.h @@ -95,144 +95,144 @@ class VIEWS_EXPORT DesktopNativeWidgetAura protected: // Overridden from internal::NativeWidgetPrivate: - virtual void InitNativeWidget(const Widget::InitParams& params) OVERRIDE; - virtual NonClientFrameView* CreateNonClientFrameView() OVERRIDE; - virtual bool ShouldUseNativeFrame() const OVERRIDE; - virtual bool ShouldWindowContentsBeTransparent() const OVERRIDE; - virtual void FrameTypeChanged() OVERRIDE; - virtual Widget* GetWidget() OVERRIDE; - virtual const Widget* GetWidget() const OVERRIDE; - virtual gfx::NativeView GetNativeView() const OVERRIDE; - virtual gfx::NativeWindow GetNativeWindow() const OVERRIDE; - virtual Widget* GetTopLevelWidget() OVERRIDE; - virtual const ui::Compositor* GetCompositor() const OVERRIDE; - virtual ui::Compositor* GetCompositor() OVERRIDE; - virtual ui::Layer* GetLayer() OVERRIDE; - virtual void ReorderNativeViews() OVERRIDE; - virtual void ViewRemoved(View* view) OVERRIDE; - virtual void SetNativeWindowProperty(const char* name, void* value) OVERRIDE; - virtual void* GetNativeWindowProperty(const char* name) const OVERRIDE; - virtual TooltipManager* GetTooltipManager() const OVERRIDE; - virtual void SetCapture() OVERRIDE; - virtual void ReleaseCapture() OVERRIDE; - virtual bool HasCapture() const OVERRIDE; - virtual InputMethod* CreateInputMethod() OVERRIDE; - virtual internal::InputMethodDelegate* GetInputMethodDelegate() OVERRIDE; - virtual ui::InputMethod* GetHostInputMethod() OVERRIDE; - virtual void CenterWindow(const gfx::Size& size) OVERRIDE; + virtual void InitNativeWidget(const Widget::InitParams& params) override; + virtual NonClientFrameView* CreateNonClientFrameView() override; + virtual bool ShouldUseNativeFrame() const override; + virtual bool ShouldWindowContentsBeTransparent() const override; + virtual void FrameTypeChanged() override; + virtual Widget* GetWidget() override; + virtual const Widget* GetWidget() const override; + virtual gfx::NativeView GetNativeView() const override; + virtual gfx::NativeWindow GetNativeWindow() const override; + virtual Widget* GetTopLevelWidget() override; + virtual const ui::Compositor* GetCompositor() const override; + virtual ui::Compositor* GetCompositor() override; + virtual ui::Layer* GetLayer() override; + virtual void ReorderNativeViews() override; + virtual void ViewRemoved(View* view) override; + virtual void SetNativeWindowProperty(const char* name, void* value) override; + virtual void* GetNativeWindowProperty(const char* name) const override; + virtual TooltipManager* GetTooltipManager() const override; + virtual void SetCapture() override; + virtual void ReleaseCapture() override; + virtual bool HasCapture() const override; + virtual InputMethod* CreateInputMethod() override; + virtual internal::InputMethodDelegate* GetInputMethodDelegate() override; + virtual ui::InputMethod* GetHostInputMethod() override; + virtual void CenterWindow(const gfx::Size& size) override; virtual void GetWindowPlacement( gfx::Rect* bounds, - ui::WindowShowState* maximized) const OVERRIDE; - virtual bool SetWindowTitle(const base::string16& title) OVERRIDE; + ui::WindowShowState* maximized) const override; + virtual bool SetWindowTitle(const base::string16& title) override; virtual void SetWindowIcons(const gfx::ImageSkia& window_icon, - const gfx::ImageSkia& app_icon) OVERRIDE; - virtual void InitModalType(ui::ModalType modal_type) OVERRIDE; - virtual gfx::Rect GetWindowBoundsInScreen() const OVERRIDE; - virtual gfx::Rect GetClientAreaBoundsInScreen() const OVERRIDE; - virtual gfx::Rect GetRestoredBounds() const OVERRIDE; - virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; - virtual void SetSize(const gfx::Size& size) OVERRIDE; - virtual void StackAbove(gfx::NativeView native_view) OVERRIDE; - virtual void StackAtTop() OVERRIDE; - virtual void StackBelow(gfx::NativeView native_view) OVERRIDE; - virtual void SetShape(gfx::NativeRegion shape) OVERRIDE; - virtual void Close() OVERRIDE; - virtual void CloseNow() OVERRIDE; - virtual void Show() OVERRIDE; - virtual void Hide() OVERRIDE; + const gfx::ImageSkia& app_icon) override; + virtual void InitModalType(ui::ModalType modal_type) override; + virtual gfx::Rect GetWindowBoundsInScreen() const override; + virtual gfx::Rect GetClientAreaBoundsInScreen() const override; + virtual gfx::Rect GetRestoredBounds() const override; + virtual void SetBounds(const gfx::Rect& bounds) override; + virtual void SetSize(const gfx::Size& size) override; + virtual void StackAbove(gfx::NativeView native_view) override; + virtual void StackAtTop() override; + virtual void StackBelow(gfx::NativeView native_view) override; + virtual void SetShape(gfx::NativeRegion shape) override; + virtual void Close() override; + virtual void CloseNow() override; + virtual void Show() override; + virtual void Hide() override; virtual void ShowMaximizedWithBounds( - const gfx::Rect& restored_bounds) OVERRIDE; - virtual void ShowWithWindowState(ui::WindowShowState state) OVERRIDE; - virtual bool IsVisible() const OVERRIDE; - virtual void Activate() OVERRIDE; - virtual void Deactivate() OVERRIDE; - virtual bool IsActive() const OVERRIDE; - virtual void SetAlwaysOnTop(bool always_on_top) OVERRIDE; - virtual bool IsAlwaysOnTop() const OVERRIDE; - virtual void SetVisibleOnAllWorkspaces(bool always_visible) OVERRIDE; - virtual void Maximize() OVERRIDE; - virtual void Minimize() OVERRIDE; - virtual bool IsMaximized() const OVERRIDE; - virtual bool IsMinimized() const OVERRIDE; - virtual void Restore() OVERRIDE; - virtual void SetFullscreen(bool fullscreen) OVERRIDE; - virtual bool IsFullscreen() const OVERRIDE; - virtual void SetOpacity(unsigned char opacity) OVERRIDE; - virtual void SetUseDragFrame(bool use_drag_frame) OVERRIDE; - virtual void FlashFrame(bool flash_frame) OVERRIDE; + const gfx::Rect& restored_bounds) override; + virtual void ShowWithWindowState(ui::WindowShowState state) override; + virtual bool IsVisible() const override; + virtual void Activate() override; + virtual void Deactivate() override; + virtual bool IsActive() const override; + virtual void SetAlwaysOnTop(bool always_on_top) override; + virtual bool IsAlwaysOnTop() const override; + virtual void SetVisibleOnAllWorkspaces(bool always_visible) override; + virtual void Maximize() override; + virtual void Minimize() override; + virtual bool IsMaximized() const override; + virtual bool IsMinimized() const override; + virtual void Restore() override; + virtual void SetFullscreen(bool fullscreen) override; + virtual bool IsFullscreen() const override; + virtual void SetOpacity(unsigned char opacity) override; + virtual void SetUseDragFrame(bool use_drag_frame) override; + virtual void FlashFrame(bool flash_frame) override; virtual void RunShellDrag(View* view, const ui::OSExchangeData& data, const gfx::Point& location, int operation, - ui::DragDropTypes::DragEventSource source) OVERRIDE; - virtual void SchedulePaintInRect(const gfx::Rect& rect) OVERRIDE; - virtual void SetCursor(gfx::NativeCursor cursor) OVERRIDE; - virtual bool IsMouseEventsEnabled() const OVERRIDE; - virtual void ClearNativeFocus() OVERRIDE; - virtual gfx::Rect GetWorkAreaBoundsInScreen() const OVERRIDE; + ui::DragDropTypes::DragEventSource source) override; + virtual void SchedulePaintInRect(const gfx::Rect& rect) override; + virtual void SetCursor(gfx::NativeCursor cursor) override; + virtual bool IsMouseEventsEnabled() const override; + virtual void ClearNativeFocus() override; + virtual gfx::Rect GetWorkAreaBoundsInScreen() const override; virtual Widget::MoveLoopResult RunMoveLoop( const gfx::Vector2d& drag_offset, Widget::MoveLoopSource source, - Widget::MoveLoopEscapeBehavior escape_behavior) OVERRIDE; - virtual void EndMoveLoop() OVERRIDE; - virtual void SetVisibilityChangedAnimationsEnabled(bool value) OVERRIDE; - virtual ui::NativeTheme* GetNativeTheme() const OVERRIDE; - virtual void OnRootViewLayout() OVERRIDE; - virtual bool IsTranslucentWindowOpacitySupported() const OVERRIDE; - virtual void OnSizeConstraintsChanged() OVERRIDE; - virtual void RepostNativeEvent(gfx::NativeEvent native_event) OVERRIDE; + Widget::MoveLoopEscapeBehavior escape_behavior) override; + virtual void EndMoveLoop() override; + virtual void SetVisibilityChangedAnimationsEnabled(bool value) override; + virtual ui::NativeTheme* GetNativeTheme() const override; + virtual void OnRootViewLayout() override; + virtual bool IsTranslucentWindowOpacitySupported() const override; + virtual void OnSizeConstraintsChanged() override; + virtual void RepostNativeEvent(gfx::NativeEvent native_event) override; // Overridden from aura::WindowDelegate: - virtual gfx::Size GetMinimumSize() const OVERRIDE; - virtual gfx::Size GetMaximumSize() const OVERRIDE; + virtual gfx::Size GetMinimumSize() const override; + virtual gfx::Size GetMaximumSize() const override; virtual void OnBoundsChanged(const gfx::Rect& old_bounds, - const gfx::Rect& new_bounds) OVERRIDE {} - virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE; - virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE; + const gfx::Rect& new_bounds) override {} + virtual gfx::NativeCursor GetCursor(const gfx::Point& point) override; + virtual int GetNonClientComponent(const gfx::Point& point) const override; virtual bool ShouldDescendIntoChildForEventHandling( aura::Window* child, - const gfx::Point& location) OVERRIDE; - virtual bool CanFocus() OVERRIDE; - virtual void OnCaptureLost() OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; - virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE; - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; - virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; - virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE; - virtual bool HasHitTestMask() const OVERRIDE; - virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE; + const gfx::Point& location) override; + virtual bool CanFocus() override; + virtual void OnCaptureLost() override; + virtual void OnPaint(gfx::Canvas* canvas) override; + virtual void OnDeviceScaleFactorChanged(float device_scale_factor) override; + virtual void OnWindowDestroying(aura::Window* window) override; + virtual void OnWindowDestroyed(aura::Window* window) override; + virtual void OnWindowTargetVisibilityChanged(bool visible) override; + virtual bool HasHitTestMask() const override; + virtual void GetHitTestMask(gfx::Path* mask) const override; // Overridden from ui::EventHandler: - virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE; - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; - virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE; - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; + virtual void OnKeyEvent(ui::KeyEvent* event) override; + virtual void OnMouseEvent(ui::MouseEvent* event) override; + virtual void OnScrollEvent(ui::ScrollEvent* event) override; + virtual void OnGestureEvent(ui::GestureEvent* event) override; // Overridden from aura::client::ActivationDelegate: - virtual bool ShouldActivate() const OVERRIDE; + virtual bool ShouldActivate() const override; // Overridden from aura::client::ActivationChangeObserver: virtual void OnWindowActivated(aura::Window* gained_active, - aura::Window* lost_active) OVERRIDE; + aura::Window* lost_active) override; // Overridden from aura::client::FocusChangeObserver: virtual void OnWindowFocused(aura::Window* gained_focus, - aura::Window* lost_focus) OVERRIDE; + aura::Window* lost_focus) override; // Overridden from views::internal::InputMethodDelegate: - virtual void DispatchKeyEventPostIME(const ui::KeyEvent& key) OVERRIDE; + virtual void DispatchKeyEventPostIME(const ui::KeyEvent& key) override; // Overridden from aura::client::DragDropDelegate: - virtual void OnDragEntered(const ui::DropTargetEvent& event) OVERRIDE; - virtual int OnDragUpdated(const ui::DropTargetEvent& event) OVERRIDE; - virtual void OnDragExited() OVERRIDE; - virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE; + virtual void OnDragEntered(const ui::DropTargetEvent& event) override; + virtual int OnDragUpdated(const ui::DropTargetEvent& event) override; + virtual void OnDragExited() override; + virtual int OnPerformDrop(const ui::DropTargetEvent& event) override; // Overridden from aura::WindowTreeHostObserver: - virtual void OnHostCloseRequested(const aura::WindowTreeHost* host) OVERRIDE; - virtual void OnHostResized(const aura::WindowTreeHost* host) OVERRIDE; + virtual void OnHostCloseRequested(const aura::WindowTreeHost* host) override; + virtual void OnHostResized(const aura::WindowTreeHost* host) override; virtual void OnHostMoved(const aura::WindowTreeHost* host, - const gfx::Point& new_origin) OVERRIDE; + const gfx::Point& new_origin) override; private: friend class FocusManagerEventHandler; diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc index 72bc3fb..27a5d01 100644 --- a/ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc +++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc @@ -261,7 +261,7 @@ class DesktopAuraTopLevelWindowTest // views::TestViewsDelegate overrides. virtual void OnBeforeWidgetInit( Widget::InitParams* params, - internal::NativeWidgetDelegate* delegate) OVERRIDE { + internal::NativeWidgetDelegate* delegate) override { if (!params->native_widget) params->native_widget = new views::DesktopNativeWidgetAura(delegate); } @@ -311,7 +311,7 @@ class DesktopAuraTopLevelWindowTest top_level_widget_->CloseNow(); } - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE { + virtual void OnWindowDestroying(aura::Window* window) override { window->RemoveObserver(this); if (window == owned_window_) { owned_window_destroyed_ = true; diff --git a/ui/views/widget/desktop_aura/desktop_screen_position_client.h b/ui/views/widget/desktop_aura/desktop_screen_position_client.h index 222c2a1..9ccf72c 100644 --- a/ui/views/widget/desktop_aura/desktop_screen_position_client.h +++ b/ui/views/widget/desktop_aura/desktop_screen_position_client.h @@ -20,14 +20,14 @@ class VIEWS_EXPORT DesktopScreenPositionClient // aura::client::ScreenPositionClient overrides: virtual void ConvertPointToScreen(const aura::Window* window, - gfx::Point* point) OVERRIDE; + gfx::Point* point) override; virtual void ConvertPointFromScreen(const aura::Window* window, - gfx::Point* point) OVERRIDE; + gfx::Point* point) override; virtual void ConvertHostPointToScreen(aura::Window* window, - gfx::Point* point) OVERRIDE; + gfx::Point* point) override; virtual void SetBounds(aura::Window* window, const gfx::Rect& bounds, - const gfx::Display& display) OVERRIDE; + const gfx::Display& display) override; private: aura::Window* root_window_; diff --git a/ui/views/widget/desktop_aura/desktop_screen_win.h b/ui/views/widget/desktop_aura/desktop_screen_win.h index 3225d61..0ba1f5d 100644 --- a/ui/views/widget/desktop_aura/desktop_screen_win.h +++ b/ui/views/widget/desktop_aura/desktop_screen_win.h @@ -17,11 +17,11 @@ public: private: // Overridden from gfx::ScreenWin: - virtual bool IsDIPEnabled() OVERRIDE; + virtual bool IsDIPEnabled() override; virtual gfx::Display GetDisplayMatching( - const gfx::Rect& match_rect) const OVERRIDE; - virtual HWND GetHWNDFromNativeView(gfx::NativeView window) const OVERRIDE; - virtual gfx::NativeWindow GetNativeWindowFromHWND(HWND hwnd) const OVERRIDE; + const gfx::Rect& match_rect) const override; + virtual HWND GetHWNDFromNativeView(gfx::NativeView window) const override; + virtual gfx::NativeWindow GetNativeWindowFromHWND(HWND hwnd) const override; DISALLOW_COPY_AND_ASSIGN(DesktopScreenWin); }; diff --git a/ui/views/widget/desktop_aura/desktop_screen_x11.h b/ui/views/widget/desktop_aura/desktop_screen_x11.h index ff47806..1fc32d1 100644 --- a/ui/views/widget/desktop_aura/desktop_screen_x11.h +++ b/ui/views/widget/desktop_aura/desktop_screen_x11.h @@ -31,26 +31,26 @@ class VIEWS_EXPORT DesktopScreenX11 : public gfx::Screen, virtual ~DesktopScreenX11(); // Overridden from gfx::Screen: - virtual bool IsDIPEnabled() OVERRIDE; - virtual gfx::Point GetCursorScreenPoint() OVERRIDE; - virtual gfx::NativeWindow GetWindowUnderCursor() OVERRIDE; + virtual bool IsDIPEnabled() override; + virtual gfx::Point GetCursorScreenPoint() override; + virtual gfx::NativeWindow GetWindowUnderCursor() override; virtual gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) - OVERRIDE; - virtual int GetNumDisplays() const OVERRIDE; - virtual std::vector<gfx::Display> GetAllDisplays() const OVERRIDE; + override; + virtual int GetNumDisplays() const override; + virtual std::vector<gfx::Display> GetAllDisplays() const override; virtual gfx::Display GetDisplayNearestWindow( - gfx::NativeView window) const OVERRIDE; + gfx::NativeView window) const override; virtual gfx::Display GetDisplayNearestPoint( - const gfx::Point& point) const OVERRIDE; + const gfx::Point& point) const override; virtual gfx::Display GetDisplayMatching( - const gfx::Rect& match_rect) const OVERRIDE; - virtual gfx::Display GetPrimaryDisplay() const OVERRIDE; - virtual void AddObserver(gfx::DisplayObserver* observer) OVERRIDE; - virtual void RemoveObserver(gfx::DisplayObserver* observer) OVERRIDE; + const gfx::Rect& match_rect) const override; + virtual gfx::Display GetPrimaryDisplay() const override; + virtual void AddObserver(gfx::DisplayObserver* observer) override; + virtual void RemoveObserver(gfx::DisplayObserver* observer) override; // ui::PlatformEventDispatcher: - virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE; - virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) OVERRIDE; + virtual bool CanDispatchEvent(const ui::PlatformEvent& event) override; + virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) override; private: friend class DesktopScreenX11Test; diff --git a/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc b/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc index 75a71ac..4b18ee7 100644 --- a/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc +++ b/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc @@ -34,7 +34,7 @@ class TestDesktopNativeWidgetAura : public views::DesktopNativeWidgetAura { } // DesktopNativeWidgetAura: - virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE { + virtual int GetNonClientComponent(const gfx::Point& point) const override { return window_component_; } @@ -58,7 +58,7 @@ class DesktopScreenX11Test : public views::ViewsTestBase, virtual ~DesktopScreenX11Test() {} // Overridden from testing::Test: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ViewsTestBase::SetUp(); // Initialize the world to the single monitor case. std::vector<gfx::Display> displays; @@ -67,7 +67,7 @@ class DesktopScreenX11Test : public views::ViewsTestBase, screen_->AddObserver(this); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { screen_.reset(); ViewsTestBase::TearDown(); } @@ -111,16 +111,16 @@ class DesktopScreenX11Test : public views::ViewsTestBase, private: // Overridden from gfx::DisplayObserver: - virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE { + virtual void OnDisplayAdded(const gfx::Display& new_display) override { added_display_.push_back(new_display); } - virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE { + virtual void OnDisplayRemoved(const gfx::Display& old_display) override { removed_display_.push_back(old_display); } virtual void OnDisplayMetricsChanged(const gfx::Display& display, - uint32_t metrics) OVERRIDE { + uint32_t metrics) override { changed_display_.push_back(display); } diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h index b6718a56..83ffd08 100644 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h @@ -46,163 +46,163 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin protected: // Overridden from DesktopWindowTreeHost: virtual void Init(aura::Window* content_window, - const Widget::InitParams& params) OVERRIDE; - virtual void OnNativeWidgetCreated(const Widget::InitParams& params) OVERRIDE; - virtual scoped_ptr<corewm::Tooltip> CreateTooltip() OVERRIDE; + const Widget::InitParams& params) override; + virtual void OnNativeWidgetCreated(const Widget::InitParams& params) override; + virtual scoped_ptr<corewm::Tooltip> CreateTooltip() override; virtual scoped_ptr<aura::client::DragDropClient> - CreateDragDropClient(DesktopNativeCursorManager* cursor_manager) OVERRIDE; - virtual void Close() OVERRIDE; - virtual void CloseNow() OVERRIDE; - virtual aura::WindowTreeHost* AsWindowTreeHost() OVERRIDE; - virtual void ShowWindowWithState(ui::WindowShowState show_state) OVERRIDE; + CreateDragDropClient(DesktopNativeCursorManager* cursor_manager) override; + virtual void Close() override; + virtual void CloseNow() override; + virtual aura::WindowTreeHost* AsWindowTreeHost() override; + virtual void ShowWindowWithState(ui::WindowShowState show_state) override; virtual void ShowMaximizedWithBounds( - const gfx::Rect& restored_bounds) OVERRIDE; - virtual bool IsVisible() const OVERRIDE; - virtual void SetSize(const gfx::Size& size) OVERRIDE; - virtual void StackAtTop() OVERRIDE; - virtual void CenterWindow(const gfx::Size& size) OVERRIDE; + const gfx::Rect& restored_bounds) override; + virtual bool IsVisible() const override; + virtual void SetSize(const gfx::Size& size) override; + virtual void StackAtTop() override; + virtual void CenterWindow(const gfx::Size& size) override; virtual void GetWindowPlacement( gfx::Rect* bounds, - ui::WindowShowState* show_state) const OVERRIDE; - virtual gfx::Rect GetWindowBoundsInScreen() const OVERRIDE; - virtual gfx::Rect GetClientAreaBoundsInScreen() const OVERRIDE; - virtual gfx::Rect GetRestoredBounds() const OVERRIDE; - virtual gfx::Rect GetWorkAreaBoundsInScreen() const OVERRIDE; - virtual void SetShape(gfx::NativeRegion native_region) OVERRIDE; - virtual void Activate() OVERRIDE; - virtual void Deactivate() OVERRIDE; - virtual bool IsActive() const OVERRIDE; - virtual void Maximize() OVERRIDE; - virtual void Minimize() OVERRIDE; - virtual void Restore() OVERRIDE; - virtual bool IsMaximized() const OVERRIDE; - virtual bool IsMinimized() const OVERRIDE; - virtual bool HasCapture() const OVERRIDE; - virtual void SetAlwaysOnTop(bool always_on_top) OVERRIDE; - virtual bool IsAlwaysOnTop() const OVERRIDE; - virtual void SetVisibleOnAllWorkspaces(bool always_visible) OVERRIDE; - virtual bool SetWindowTitle(const base::string16& title) OVERRIDE; - virtual void ClearNativeFocus() OVERRIDE; + ui::WindowShowState* show_state) const override; + virtual gfx::Rect GetWindowBoundsInScreen() const override; + virtual gfx::Rect GetClientAreaBoundsInScreen() const override; + virtual gfx::Rect GetRestoredBounds() const override; + virtual gfx::Rect GetWorkAreaBoundsInScreen() const override; + virtual void SetShape(gfx::NativeRegion native_region) override; + virtual void Activate() override; + virtual void Deactivate() override; + virtual bool IsActive() const override; + virtual void Maximize() override; + virtual void Minimize() override; + virtual void Restore() override; + virtual bool IsMaximized() const override; + virtual bool IsMinimized() const override; + virtual bool HasCapture() const override; + virtual void SetAlwaysOnTop(bool always_on_top) override; + virtual bool IsAlwaysOnTop() const override; + virtual void SetVisibleOnAllWorkspaces(bool always_visible) override; + virtual bool SetWindowTitle(const base::string16& title) override; + virtual void ClearNativeFocus() override; virtual Widget::MoveLoopResult RunMoveLoop( const gfx::Vector2d& drag_offset, Widget::MoveLoopSource source, - Widget::MoveLoopEscapeBehavior escape_behavior) OVERRIDE; - virtual void EndMoveLoop() OVERRIDE; - virtual void SetVisibilityChangedAnimationsEnabled(bool value) OVERRIDE; - virtual bool ShouldUseNativeFrame() const OVERRIDE; - virtual bool ShouldWindowContentsBeTransparent() const OVERRIDE; - virtual void FrameTypeChanged() OVERRIDE; - virtual void SetFullscreen(bool fullscreen) OVERRIDE; - virtual bool IsFullscreen() const OVERRIDE; - virtual void SetOpacity(unsigned char opacity) OVERRIDE; + Widget::MoveLoopEscapeBehavior escape_behavior) override; + virtual void EndMoveLoop() override; + virtual void SetVisibilityChangedAnimationsEnabled(bool value) override; + virtual bool ShouldUseNativeFrame() const override; + virtual bool ShouldWindowContentsBeTransparent() const override; + virtual void FrameTypeChanged() override; + virtual void SetFullscreen(bool fullscreen) override; + virtual bool IsFullscreen() const override; + virtual void SetOpacity(unsigned char opacity) override; virtual void SetWindowIcons(const gfx::ImageSkia& window_icon, - const gfx::ImageSkia& app_icon) OVERRIDE; - virtual void InitModalType(ui::ModalType modal_type) OVERRIDE; - virtual void FlashFrame(bool flash_frame) OVERRIDE; - virtual void OnRootViewLayout() OVERRIDE; - virtual void OnNativeWidgetFocus() OVERRIDE; - virtual void OnNativeWidgetBlur() OVERRIDE; - virtual bool IsAnimatingClosed() const OVERRIDE; - virtual bool IsTranslucentWindowOpacitySupported() const OVERRIDE; - virtual void SizeConstraintsChanged() OVERRIDE; + const gfx::ImageSkia& app_icon) override; + virtual void InitModalType(ui::ModalType modal_type) override; + virtual void FlashFrame(bool flash_frame) override; + virtual void OnRootViewLayout() override; + virtual void OnNativeWidgetFocus() override; + virtual void OnNativeWidgetBlur() override; + virtual bool IsAnimatingClosed() const override; + virtual bool IsTranslucentWindowOpacitySupported() const override; + virtual void SizeConstraintsChanged() override; // Overridden from aura::WindowTreeHost: - virtual ui::EventSource* GetEventSource() OVERRIDE; - virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE; - virtual void Show() OVERRIDE; - virtual void Hide() OVERRIDE; - virtual gfx::Rect GetBounds() const OVERRIDE; - virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; - virtual gfx::Point GetLocationOnNativeScreen() const OVERRIDE; - virtual void SetCapture() OVERRIDE; - virtual void ReleaseCapture() OVERRIDE; - virtual void PostNativeEvent(const base::NativeEvent& native_event) OVERRIDE; - virtual void SetCursorNative(gfx::NativeCursor cursor) OVERRIDE; - virtual void OnCursorVisibilityChangedNative(bool show) OVERRIDE; - virtual void MoveCursorToNative(const gfx::Point& location) OVERRIDE; + virtual ui::EventSource* GetEventSource() override; + virtual gfx::AcceleratedWidget GetAcceleratedWidget() override; + virtual void Show() override; + virtual void Hide() override; + virtual gfx::Rect GetBounds() const override; + virtual void SetBounds(const gfx::Rect& bounds) override; + virtual gfx::Point GetLocationOnNativeScreen() const override; + virtual void SetCapture() override; + virtual void ReleaseCapture() override; + virtual void PostNativeEvent(const base::NativeEvent& native_event) override; + virtual void SetCursorNative(gfx::NativeCursor cursor) override; + virtual void OnCursorVisibilityChangedNative(bool show) override; + virtual void MoveCursorToNative(const gfx::Point& location) override; // Overridden frm ui::EventSource - virtual ui::EventProcessor* GetEventProcessor() OVERRIDE; + virtual ui::EventProcessor* GetEventProcessor() override; // Overridden from aura::client::AnimationHost virtual void SetHostTransitionOffsets( const gfx::Vector2d& top_left_delta, - const gfx::Vector2d& bottom_right_delta) OVERRIDE; - virtual void OnWindowHidingAnimationCompleted() OVERRIDE; + const gfx::Vector2d& bottom_right_delta) override; + virtual void OnWindowHidingAnimationCompleted() override; // Overridden from HWNDMessageHandlerDelegate: - virtual bool IsWidgetWindow() const OVERRIDE; - virtual bool IsUsingCustomFrame() const OVERRIDE; - virtual void SchedulePaint() OVERRIDE; - virtual void EnableInactiveRendering() OVERRIDE; - virtual bool IsInactiveRenderingDisabled() OVERRIDE; - virtual bool CanResize() const OVERRIDE; - virtual bool CanMaximize() const OVERRIDE; - virtual bool CanMinimize() const OVERRIDE; - virtual bool CanActivate() const OVERRIDE; - virtual bool WidgetSizeIsClientSize() const OVERRIDE; - virtual bool IsModal() const OVERRIDE; - virtual int GetInitialShowState() const OVERRIDE; - virtual bool WillProcessWorkAreaChange() const OVERRIDE; - virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE; - virtual void GetWindowMask(const gfx::Size& size, gfx::Path* path) OVERRIDE; - virtual bool GetClientAreaInsets(gfx::Insets* insets) const OVERRIDE; + virtual bool IsWidgetWindow() const override; + virtual bool IsUsingCustomFrame() const override; + virtual void SchedulePaint() override; + virtual void EnableInactiveRendering() override; + virtual bool IsInactiveRenderingDisabled() override; + virtual bool CanResize() const override; + virtual bool CanMaximize() const override; + virtual bool CanMinimize() const override; + virtual bool CanActivate() const override; + virtual bool WidgetSizeIsClientSize() const override; + virtual bool IsModal() const override; + virtual int GetInitialShowState() const override; + virtual bool WillProcessWorkAreaChange() const override; + virtual int GetNonClientComponent(const gfx::Point& point) const override; + virtual void GetWindowMask(const gfx::Size& size, gfx::Path* path) override; + virtual bool GetClientAreaInsets(gfx::Insets* insets) const override; virtual void GetMinMaxSize(gfx::Size* min_size, - gfx::Size* max_size) const OVERRIDE; - virtual gfx::Size GetRootViewSize() const OVERRIDE; - virtual void ResetWindowControls() OVERRIDE; - virtual void PaintLayeredWindow(gfx::Canvas* canvas) OVERRIDE; - virtual gfx::NativeViewAccessible GetNativeViewAccessible() OVERRIDE; - virtual bool ShouldHandleSystemCommands() const OVERRIDE; - virtual InputMethod* GetInputMethod() OVERRIDE; - virtual void HandleAppDeactivated() OVERRIDE; - virtual void HandleActivationChanged(bool active) OVERRIDE; - virtual bool HandleAppCommand(short command) OVERRIDE; - virtual void HandleCancelMode() OVERRIDE; - virtual void HandleCaptureLost() OVERRIDE; - virtual void HandleClose() OVERRIDE; - virtual bool HandleCommand(int command) OVERRIDE; - virtual void HandleAccelerator(const ui::Accelerator& accelerator) OVERRIDE; - virtual void HandleCreate() OVERRIDE; - virtual void HandleDestroying() OVERRIDE; - virtual void HandleDestroyed() OVERRIDE; - virtual bool HandleInitialFocus(ui::WindowShowState show_state) OVERRIDE; - virtual void HandleDisplayChange() OVERRIDE; - virtual void HandleBeginWMSizeMove() OVERRIDE; - virtual void HandleEndWMSizeMove() OVERRIDE; - virtual void HandleMove() OVERRIDE; - virtual void HandleWorkAreaChanged() OVERRIDE; - virtual void HandleVisibilityChanging(bool visible) OVERRIDE; - virtual void HandleVisibilityChanged(bool visible) OVERRIDE; - virtual void HandleClientSizeChanged(const gfx::Size& new_size) OVERRIDE; - virtual void HandleFrameChanged() OVERRIDE; - virtual void HandleNativeFocus(HWND last_focused_window) OVERRIDE; - virtual void HandleNativeBlur(HWND focused_window) OVERRIDE; - virtual bool HandleMouseEvent(const ui::MouseEvent& event) OVERRIDE; - virtual bool HandleKeyEvent(const ui::KeyEvent& event) OVERRIDE; - virtual bool HandleUntranslatedKeyEvent(const ui::KeyEvent& event) OVERRIDE; - virtual void HandleTouchEvent(const ui::TouchEvent& event) OVERRIDE; + gfx::Size* max_size) const override; + virtual gfx::Size GetRootViewSize() const override; + virtual void ResetWindowControls() override; + virtual void PaintLayeredWindow(gfx::Canvas* canvas) override; + virtual gfx::NativeViewAccessible GetNativeViewAccessible() override; + virtual bool ShouldHandleSystemCommands() const override; + virtual InputMethod* GetInputMethod() override; + virtual void HandleAppDeactivated() override; + virtual void HandleActivationChanged(bool active) override; + virtual bool HandleAppCommand(short command) override; + virtual void HandleCancelMode() override; + virtual void HandleCaptureLost() override; + virtual void HandleClose() override; + virtual bool HandleCommand(int command) override; + virtual void HandleAccelerator(const ui::Accelerator& accelerator) override; + virtual void HandleCreate() override; + virtual void HandleDestroying() override; + virtual void HandleDestroyed() override; + virtual bool HandleInitialFocus(ui::WindowShowState show_state) override; + virtual void HandleDisplayChange() override; + virtual void HandleBeginWMSizeMove() override; + virtual void HandleEndWMSizeMove() override; + virtual void HandleMove() override; + virtual void HandleWorkAreaChanged() override; + virtual void HandleVisibilityChanging(bool visible) override; + virtual void HandleVisibilityChanged(bool visible) override; + virtual void HandleClientSizeChanged(const gfx::Size& new_size) override; + virtual void HandleFrameChanged() override; + virtual void HandleNativeFocus(HWND last_focused_window) override; + virtual void HandleNativeBlur(HWND focused_window) override; + virtual bool HandleMouseEvent(const ui::MouseEvent& event) override; + virtual bool HandleKeyEvent(const ui::KeyEvent& event) override; + virtual bool HandleUntranslatedKeyEvent(const ui::KeyEvent& event) override; + virtual void HandleTouchEvent(const ui::TouchEvent& event) override; virtual bool HandleIMEMessage(UINT message, WPARAM w_param, LPARAM l_param, - LRESULT* result) OVERRIDE; + LRESULT* result) override; virtual void HandleInputLanguageChange(DWORD character_set, - HKL input_language_id) OVERRIDE; - virtual bool HandlePaintAccelerated(const gfx::Rect& invalid_rect) OVERRIDE; - virtual void HandlePaint(gfx::Canvas* canvas) OVERRIDE; + HKL input_language_id) override; + virtual bool HandlePaintAccelerated(const gfx::Rect& invalid_rect) override; + virtual void HandlePaint(gfx::Canvas* canvas) override; virtual bool HandleTooltipNotify(int w_param, NMHDR* l_param, - LRESULT* l_result) OVERRIDE; - virtual void HandleMenuLoop(bool in_menu_loop) OVERRIDE; + LRESULT* l_result) override; + virtual void HandleMenuLoop(bool in_menu_loop) override; virtual bool PreHandleMSG(UINT message, WPARAM w_param, LPARAM l_param, - LRESULT* result) OVERRIDE; + LRESULT* result) override; virtual void PostHandleMSG(UINT message, WPARAM w_param, - LPARAM l_param) OVERRIDE; - virtual bool HandleScrollEvent(const ui::ScrollEvent& event) OVERRIDE; - virtual void HandleWindowSizeChanging() OVERRIDE; + LPARAM l_param) override; + virtual bool HandleScrollEvent(const ui::ScrollEvent& event) override; + virtual void HandleWindowSizeChanging() override; Widget* GetWidget(); const Widget* GetWidget() const; diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h index 8a5e51f..808bed7 100644 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h @@ -88,83 +88,83 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11 protected: // Overridden from DesktopWindowTreeHost: virtual void Init(aura::Window* content_window, - const Widget::InitParams& params) OVERRIDE; - virtual void OnNativeWidgetCreated(const Widget::InitParams& params) OVERRIDE; - virtual scoped_ptr<corewm::Tooltip> CreateTooltip() OVERRIDE; + const Widget::InitParams& params) override; + virtual void OnNativeWidgetCreated(const Widget::InitParams& params) override; + virtual scoped_ptr<corewm::Tooltip> CreateTooltip() override; virtual scoped_ptr<aura::client::DragDropClient> - CreateDragDropClient(DesktopNativeCursorManager* cursor_manager) OVERRIDE; - virtual void Close() OVERRIDE; - virtual void CloseNow() OVERRIDE; - virtual aura::WindowTreeHost* AsWindowTreeHost() OVERRIDE; - virtual void ShowWindowWithState(ui::WindowShowState show_state) OVERRIDE; + CreateDragDropClient(DesktopNativeCursorManager* cursor_manager) override; + virtual void Close() override; + virtual void CloseNow() override; + virtual aura::WindowTreeHost* AsWindowTreeHost() override; + virtual void ShowWindowWithState(ui::WindowShowState show_state) override; virtual void ShowMaximizedWithBounds( - const gfx::Rect& restored_bounds) OVERRIDE; - virtual bool IsVisible() const OVERRIDE; - virtual void SetSize(const gfx::Size& requested_size) OVERRIDE; - virtual void StackAtTop() OVERRIDE; - virtual void CenterWindow(const gfx::Size& size) OVERRIDE; + const gfx::Rect& restored_bounds) override; + virtual bool IsVisible() const override; + virtual void SetSize(const gfx::Size& requested_size) override; + virtual void StackAtTop() override; + virtual void CenterWindow(const gfx::Size& size) override; virtual void GetWindowPlacement( gfx::Rect* bounds, - ui::WindowShowState* show_state) const OVERRIDE; - virtual gfx::Rect GetWindowBoundsInScreen() const OVERRIDE; - virtual gfx::Rect GetClientAreaBoundsInScreen() const OVERRIDE; - virtual gfx::Rect GetRestoredBounds() const OVERRIDE; - virtual gfx::Rect GetWorkAreaBoundsInScreen() const OVERRIDE; - virtual void SetShape(gfx::NativeRegion native_region) OVERRIDE; - virtual void Activate() OVERRIDE; - virtual void Deactivate() OVERRIDE; - virtual bool IsActive() const OVERRIDE; - virtual void Maximize() OVERRIDE; - virtual void Minimize() OVERRIDE; - virtual void Restore() OVERRIDE; - virtual bool IsMaximized() const OVERRIDE; - virtual bool IsMinimized() const OVERRIDE; - virtual bool HasCapture() const OVERRIDE; - virtual void SetAlwaysOnTop(bool always_on_top) OVERRIDE; - virtual bool IsAlwaysOnTop() const OVERRIDE; - virtual void SetVisibleOnAllWorkspaces(bool always_visible) OVERRIDE; - virtual bool SetWindowTitle(const base::string16& title) OVERRIDE; - virtual void ClearNativeFocus() OVERRIDE; + ui::WindowShowState* show_state) const override; + virtual gfx::Rect GetWindowBoundsInScreen() const override; + virtual gfx::Rect GetClientAreaBoundsInScreen() const override; + virtual gfx::Rect GetRestoredBounds() const override; + virtual gfx::Rect GetWorkAreaBoundsInScreen() const override; + virtual void SetShape(gfx::NativeRegion native_region) override; + virtual void Activate() override; + virtual void Deactivate() override; + virtual bool IsActive() const override; + virtual void Maximize() override; + virtual void Minimize() override; + virtual void Restore() override; + virtual bool IsMaximized() const override; + virtual bool IsMinimized() const override; + virtual bool HasCapture() const override; + virtual void SetAlwaysOnTop(bool always_on_top) override; + virtual bool IsAlwaysOnTop() const override; + virtual void SetVisibleOnAllWorkspaces(bool always_visible) override; + virtual bool SetWindowTitle(const base::string16& title) override; + virtual void ClearNativeFocus() override; virtual Widget::MoveLoopResult RunMoveLoop( const gfx::Vector2d& drag_offset, Widget::MoveLoopSource source, - Widget::MoveLoopEscapeBehavior escape_behavior) OVERRIDE; - virtual void EndMoveLoop() OVERRIDE; - virtual void SetVisibilityChangedAnimationsEnabled(bool value) OVERRIDE; - virtual bool ShouldUseNativeFrame() const OVERRIDE; - virtual bool ShouldWindowContentsBeTransparent() const OVERRIDE; - virtual void FrameTypeChanged() OVERRIDE; - virtual void SetFullscreen(bool fullscreen) OVERRIDE; - virtual bool IsFullscreen() const OVERRIDE; - virtual void SetOpacity(unsigned char opacity) OVERRIDE; + Widget::MoveLoopEscapeBehavior escape_behavior) override; + virtual void EndMoveLoop() override; + virtual void SetVisibilityChangedAnimationsEnabled(bool value) override; + virtual bool ShouldUseNativeFrame() const override; + virtual bool ShouldWindowContentsBeTransparent() const override; + virtual void FrameTypeChanged() override; + virtual void SetFullscreen(bool fullscreen) override; + virtual bool IsFullscreen() const override; + virtual void SetOpacity(unsigned char opacity) override; virtual void SetWindowIcons(const gfx::ImageSkia& window_icon, - const gfx::ImageSkia& app_icon) OVERRIDE; - virtual void InitModalType(ui::ModalType modal_type) OVERRIDE; - virtual void FlashFrame(bool flash_frame) OVERRIDE; - virtual void OnRootViewLayout() OVERRIDE; - virtual void OnNativeWidgetFocus() OVERRIDE; - virtual void OnNativeWidgetBlur() OVERRIDE; - virtual bool IsAnimatingClosed() const OVERRIDE; - virtual bool IsTranslucentWindowOpacitySupported() const OVERRIDE; - virtual void SizeConstraintsChanged() OVERRIDE; + const gfx::ImageSkia& app_icon) override; + virtual void InitModalType(ui::ModalType modal_type) override; + virtual void FlashFrame(bool flash_frame) override; + virtual void OnRootViewLayout() override; + virtual void OnNativeWidgetFocus() override; + virtual void OnNativeWidgetBlur() override; + virtual bool IsAnimatingClosed() const override; + virtual bool IsTranslucentWindowOpacitySupported() const override; + virtual void SizeConstraintsChanged() override; // Overridden from aura::WindowTreeHost: - virtual ui::EventSource* GetEventSource() OVERRIDE; - virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE; - virtual void Show() OVERRIDE; - virtual void Hide() OVERRIDE; - virtual gfx::Rect GetBounds() const OVERRIDE; - virtual void SetBounds(const gfx::Rect& requested_bounds) OVERRIDE; - virtual gfx::Point GetLocationOnNativeScreen() const OVERRIDE; - virtual void SetCapture() OVERRIDE; - virtual void ReleaseCapture() OVERRIDE; - virtual void PostNativeEvent(const base::NativeEvent& native_event) OVERRIDE; - virtual void SetCursorNative(gfx::NativeCursor cursor) OVERRIDE; - virtual void MoveCursorToNative(const gfx::Point& location) OVERRIDE; - virtual void OnCursorVisibilityChangedNative(bool show) OVERRIDE; + virtual ui::EventSource* GetEventSource() override; + virtual gfx::AcceleratedWidget GetAcceleratedWidget() override; + virtual void Show() override; + virtual void Hide() override; + virtual gfx::Rect GetBounds() const override; + virtual void SetBounds(const gfx::Rect& requested_bounds) override; + virtual gfx::Point GetLocationOnNativeScreen() const override; + virtual void SetCapture() override; + virtual void ReleaseCapture() override; + virtual void PostNativeEvent(const base::NativeEvent& native_event) override; + virtual void SetCursorNative(gfx::NativeCursor cursor) override; + virtual void MoveCursorToNative(const gfx::Point& location) override; + virtual void OnCursorVisibilityChangedNative(bool show) override; // Overridden frm ui::EventSource - virtual ui::EventProcessor* GetEventProcessor() OVERRIDE; + virtual ui::EventProcessor* GetEventProcessor() override; private: // Initializes our X11 surface to draw on. This method performs all @@ -235,8 +235,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11 void Relayout(); // ui::PlatformEventDispatcher: - virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE; - virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) OVERRIDE; + virtual bool CanDispatchEvent(const ui::PlatformEvent& event) override; + virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) override; void DelayedResize(const gfx::Size& size); diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11_interactive_uitest.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11_interactive_uitest.cc index 8a986d7..869a3c7 100644 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11_interactive_uitest.cc +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11_interactive_uitest.cc @@ -44,7 +44,7 @@ class ActivationWaiter : public X11PropertyChangeWaiter { private: // X11PropertyChangeWaiter: - virtual bool ShouldKeepOnWaiting(const ui::PlatformEvent& event) OVERRIDE { + virtual bool ShouldKeepOnWaiting(const ui::PlatformEvent& event) override { XID xid = 0; ui::GetXIDProperty(ui::GetX11RootWindow(), "_NET_ACTIVE_WINDOW", &xid); return xid != window_; @@ -64,7 +64,7 @@ class MouseMoveCounterHandler : public ui::EventHandler { } // ui::EventHandler: - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE { + virtual void OnMouseEvent(ui::MouseEvent* event) override { if (event->type() == ui::ET_MOUSE_MOVED) ++count_; } @@ -135,7 +135,7 @@ class DesktopWindowTreeHostX11Test : public ViewsTestBase { } // testing::Test - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ViewsTestBase::SetUp(); // Make X11 synchronous for our display connection. This does not force the @@ -143,7 +143,7 @@ class DesktopWindowTreeHostX11Test : public ViewsTestBase { XSynchronize(gfx::GetXDisplay(), True); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { XSynchronize(gfx::GetXDisplay(), False); ViewsTestBase::TearDown(); } diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11_unittest.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11_unittest.cc index bcd8f86..2e1f5db 100644 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11_unittest.cc +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11_unittest.cc @@ -53,7 +53,7 @@ class WMStateWaiter : public X11PropertyChangeWaiter { private: // X11PropertyChangeWaiter: - virtual bool ShouldKeepOnWaiting(const ui::PlatformEvent& event) OVERRIDE { + virtual bool ShouldKeepOnWaiting(const ui::PlatformEvent& event) override { std::vector<Atom> hints; if (ui::GetAtomArrayProperty(xwindow(), "_NET_WM_STATE", &hints)) { std::vector<Atom>::iterator it = std::find( @@ -87,18 +87,18 @@ class ShapedNonClientFrameView : public NonClientFrameView { } // NonClientFrameView: - virtual gfx::Rect GetBoundsForClientView() const OVERRIDE { + virtual gfx::Rect GetBoundsForClientView() const override { return bounds(); } virtual gfx::Rect GetWindowBoundsForClientBounds( - const gfx::Rect& client_bounds) const OVERRIDE { + const gfx::Rect& client_bounds) const override { return client_bounds; } - virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE { + virtual int NonClientHitTest(const gfx::Point& point) override { return HTNOWHERE; } virtual void GetWindowMask(const gfx::Size& size, - gfx::Path* window_mask) OVERRIDE { + gfx::Path* window_mask) override { int right = size.width(); int bottom = size.height(); @@ -110,13 +110,13 @@ class ShapedNonClientFrameView : public NonClientFrameView { window_mask->lineTo(right - 10, 0); window_mask->close(); } - virtual void ResetWindowControls() OVERRIDE { + virtual void ResetWindowControls() override { } - virtual void UpdateWindowIcon() OVERRIDE { + virtual void UpdateWindowIcon() override { } - virtual void UpdateWindowTitle() OVERRIDE { + virtual void UpdateWindowTitle() override { } - virtual void SizeConstraintsChanged() OVERRIDE { + virtual void SizeConstraintsChanged() override { } private: @@ -133,7 +133,7 @@ class ShapedWidgetDelegate : public WidgetDelegateView { // WidgetDelegateView: virtual NonClientFrameView* CreateNonClientFrameView( - Widget* widget) OVERRIDE { + Widget* widget) override { return new ShapedNonClientFrameView; } @@ -198,7 +198,7 @@ class DesktopWindowTreeHostX11Test : public ViewsTestBase { virtual ~DesktopWindowTreeHostX11Test() { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ViewsTestBase::SetUp(); // Make X11 synchronous for our display connection. This does not force the @@ -206,7 +206,7 @@ class DesktopWindowTreeHostX11Test : public ViewsTestBase { XSynchronize(gfx::GetXDisplay(), True); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { XSynchronize(gfx::GetXDisplay(), False); ViewsTestBase::TearDown(); } diff --git a/ui/views/widget/desktop_aura/x11_desktop_handler.h b/ui/views/widget/desktop_aura/x11_desktop_handler.h index e97b68a..8a1e61e 100644 --- a/ui/views/widget/desktop_aura/x11_desktop_handler.h +++ b/ui/views/widget/desktop_aura/x11_desktop_handler.h @@ -57,12 +57,12 @@ class VIEWS_EXPORT X11DesktopHandler : public ui::PlatformEventDispatcher, void ProcessXEvent(XEvent* event); // ui::PlatformEventDispatcher - virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE; - virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) OVERRIDE; + virtual bool CanDispatchEvent(const ui::PlatformEvent& event) override; + virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) override; // Overridden from aura::EnvObserver: - virtual void OnWindowInitialized(aura::Window* window) OVERRIDE; - virtual void OnWillDestroyEnv() OVERRIDE; + virtual void OnWindowInitialized(aura::Window* window) override; + virtual void OnWillDestroyEnv() override; private: enum ActiveState { diff --git a/ui/views/widget/desktop_aura/x11_desktop_window_move_client.h b/ui/views/widget/desktop_aura/x11_desktop_window_move_client.h index 1c93271..4da16c7 100644 --- a/ui/views/widget/desktop_aura/x11_desktop_window_move_client.h +++ b/ui/views/widget/desktop_aura/x11_desktop_window_move_client.h @@ -31,16 +31,16 @@ class VIEWS_EXPORT X11DesktopWindowMoveClient : virtual ~X11DesktopWindowMoveClient(); // Overridden from X11WholeScreenMoveLoopDelegate: - virtual void OnMouseMovement(XMotionEvent* event) OVERRIDE; - virtual void OnMouseReleased() OVERRIDE; - virtual void OnMoveLoopEnded() OVERRIDE; + virtual void OnMouseMovement(XMotionEvent* event) override; + virtual void OnMouseReleased() override; + virtual void OnMoveLoopEnded() override; // Overridden from aura::client::WindowMoveClient: virtual aura::client::WindowMoveResult RunMoveLoop( aura::Window* window, const gfx::Vector2d& drag_offset, - aura::client::WindowMoveSource move_source) OVERRIDE; - virtual void EndMoveLoop() OVERRIDE; + aura::client::WindowMoveSource move_source) override; + virtual void EndMoveLoop() override; private: X11WholeScreenMoveLoop move_loop_; diff --git a/ui/views/widget/desktop_aura/x11_topmost_window_finder.h b/ui/views/widget/desktop_aura/x11_topmost_window_finder.h index cf8498a..a8a2e41 100644 --- a/ui/views/widget/desktop_aura/x11_topmost_window_finder.h +++ b/ui/views/widget/desktop_aura/x11_topmost_window_finder.h @@ -35,7 +35,7 @@ class VIEWS_EXPORT X11TopmostWindowFinder private: // ui::EnumerateWindowsDelegate: - virtual bool ShouldStopIterating(XID xid) OVERRIDE; + virtual bool ShouldStopIterating(XID xid) override; // Returns true if |window| does not not belong to |ignore|, is visible and // contains |screen_loc_|. diff --git a/ui/views/widget/desktop_aura/x11_topmost_window_finder_interactive_uitest.cc b/ui/views/widget/desktop_aura/x11_topmost_window_finder_interactive_uitest.cc index a3ca346..edf9bca 100644 --- a/ui/views/widget/desktop_aura/x11_topmost_window_finder_interactive_uitest.cc +++ b/ui/views/widget/desktop_aura/x11_topmost_window_finder_interactive_uitest.cc @@ -51,7 +51,7 @@ class MinimizeWaiter : public X11PropertyChangeWaiter { private: // X11PropertyChangeWaiter: - virtual bool ShouldKeepOnWaiting(const ui::PlatformEvent& event) OVERRIDE { + virtual bool ShouldKeepOnWaiting(const ui::PlatformEvent& event) override { std::vector<Atom> wm_states; if (ui::GetAtomArrayProperty(xwindow(), "_NET_WM_STATE", &wm_states)) { std::vector<Atom>::iterator it = std::find( @@ -82,7 +82,7 @@ class StackingClientListWaiter : public X11PropertyChangeWaiter { } // X11PropertyChangeWaiter: - virtual void Wait() OVERRIDE { + virtual void Wait() override { // StackingClientListWaiter may be created after // _NET_CLIENT_LIST_STACKING already contains |expected_windows|. if (!ShouldKeepOnWaiting(NULL)) @@ -93,7 +93,7 @@ class StackingClientListWaiter : public X11PropertyChangeWaiter { private: // X11PropertyChangeWaiter: - virtual bool ShouldKeepOnWaiting(const ui::PlatformEvent& event) OVERRIDE { + virtual bool ShouldKeepOnWaiting(const ui::PlatformEvent& event) override { std::vector<XID> stack; ui::GetXWindowStack(ui::GetX11RootWindow(), &stack); for (size_t i = 0; i < expected_windows_.size(); ++i) { @@ -205,7 +205,7 @@ class X11TopmostWindowFinderTest : public ViewsTestBase { } // ViewsTestBase: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ViewsTestBase::SetUp(); // Make X11 synchronous for our display connection. This does not force the @@ -217,7 +217,7 @@ class X11TopmostWindowFinderTest : public ViewsTestBase { X11DesktopHandler::get(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { XSynchronize(xdisplay(), False); ViewsTestBase::TearDown(); } diff --git a/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.h b/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.h index 08cb71a..b8815fe 100644 --- a/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.h +++ b/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.h @@ -39,14 +39,14 @@ class X11WholeScreenMoveLoop : public X11MoveLoop, virtual ~X11WholeScreenMoveLoop(); // ui:::PlatformEventDispatcher: - virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE; - virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) OVERRIDE; + virtual bool CanDispatchEvent(const ui::PlatformEvent& event) override; + virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) override; // X11MoveLoop: virtual bool RunMoveLoop(aura::Window* window, - gfx::NativeCursor cursor) OVERRIDE; - virtual void UpdateCursor(gfx::NativeCursor cursor) OVERRIDE; - virtual void EndMoveLoop() OVERRIDE; + gfx::NativeCursor cursor) override; + virtual void UpdateCursor(gfx::NativeCursor cursor) override; + virtual void EndMoveLoop() override; private: // Grabs the pointer, setting the mouse cursor to |cursor|. Returns true if diff --git a/ui/views/widget/desktop_aura/x11_window_event_filter.h b/ui/views/widget/desktop_aura/x11_window_event_filter.h index 920733f..e21097c 100644 --- a/ui/views/widget/desktop_aura/x11_window_event_filter.h +++ b/ui/views/widget/desktop_aura/x11_window_event_filter.h @@ -33,7 +33,7 @@ class VIEWS_EXPORT X11WindowEventFilter : public ui::EventHandler { virtual ~X11WindowEventFilter(); // Overridden from ui::EventHandler: - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; + virtual void OnMouseEvent(ui::MouseEvent* event) override; private: // Called when the user clicked the caption area. diff --git a/ui/views/widget/native_widget_aura.h b/ui/views/widget/native_widget_aura.h index a32dc87..969f478 100644 --- a/ui/views/widget/native_widget_aura.h +++ b/ui/views/widget/native_widget_aura.h @@ -51,143 +51,143 @@ class VIEWS_EXPORT NativeWidgetAura aura::Window* window); // Overridden from internal::NativeWidgetPrivate: - virtual void InitNativeWidget(const Widget::InitParams& params) OVERRIDE; - virtual NonClientFrameView* CreateNonClientFrameView() OVERRIDE; - virtual bool ShouldUseNativeFrame() const OVERRIDE; - virtual bool ShouldWindowContentsBeTransparent() const OVERRIDE; - virtual void FrameTypeChanged() OVERRIDE; - virtual Widget* GetWidget() OVERRIDE; - virtual const Widget* GetWidget() const OVERRIDE; - virtual gfx::NativeView GetNativeView() const OVERRIDE; - virtual gfx::NativeWindow GetNativeWindow() const OVERRIDE; - virtual Widget* GetTopLevelWidget() OVERRIDE; - virtual const ui::Compositor* GetCompositor() const OVERRIDE; - virtual ui::Compositor* GetCompositor() OVERRIDE; - virtual ui::Layer* GetLayer() OVERRIDE; - virtual void ReorderNativeViews() OVERRIDE; - virtual void ViewRemoved(View* view) OVERRIDE; - virtual void SetNativeWindowProperty(const char* name, void* value) OVERRIDE; - virtual void* GetNativeWindowProperty(const char* name) const OVERRIDE; - virtual TooltipManager* GetTooltipManager() const OVERRIDE; - virtual void SetCapture() OVERRIDE; - virtual void ReleaseCapture() OVERRIDE; - virtual bool HasCapture() const OVERRIDE; - virtual InputMethod* CreateInputMethod() OVERRIDE; - virtual internal::InputMethodDelegate* GetInputMethodDelegate() OVERRIDE; - virtual ui::InputMethod* GetHostInputMethod() OVERRIDE; - virtual void CenterWindow(const gfx::Size& size) OVERRIDE; + virtual void InitNativeWidget(const Widget::InitParams& params) override; + virtual NonClientFrameView* CreateNonClientFrameView() override; + virtual bool ShouldUseNativeFrame() const override; + virtual bool ShouldWindowContentsBeTransparent() const override; + virtual void FrameTypeChanged() override; + virtual Widget* GetWidget() override; + virtual const Widget* GetWidget() const override; + virtual gfx::NativeView GetNativeView() const override; + virtual gfx::NativeWindow GetNativeWindow() const override; + virtual Widget* GetTopLevelWidget() override; + virtual const ui::Compositor* GetCompositor() const override; + virtual ui::Compositor* GetCompositor() override; + virtual ui::Layer* GetLayer() override; + virtual void ReorderNativeViews() override; + virtual void ViewRemoved(View* view) override; + virtual void SetNativeWindowProperty(const char* name, void* value) override; + virtual void* GetNativeWindowProperty(const char* name) const override; + virtual TooltipManager* GetTooltipManager() const override; + virtual void SetCapture() override; + virtual void ReleaseCapture() override; + virtual bool HasCapture() const override; + virtual InputMethod* CreateInputMethod() override; + virtual internal::InputMethodDelegate* GetInputMethodDelegate() override; + virtual ui::InputMethod* GetHostInputMethod() override; + virtual void CenterWindow(const gfx::Size& size) override; virtual void GetWindowPlacement( gfx::Rect* bounds, - ui::WindowShowState* maximized) const OVERRIDE; - virtual bool SetWindowTitle(const base::string16& title) OVERRIDE; + ui::WindowShowState* maximized) const override; + virtual bool SetWindowTitle(const base::string16& title) override; virtual void SetWindowIcons(const gfx::ImageSkia& window_icon, - const gfx::ImageSkia& app_icon) OVERRIDE; - virtual void InitModalType(ui::ModalType modal_type) OVERRIDE; - virtual gfx::Rect GetWindowBoundsInScreen() const OVERRIDE; - virtual gfx::Rect GetClientAreaBoundsInScreen() const OVERRIDE; - virtual gfx::Rect GetRestoredBounds() const OVERRIDE; - virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; - virtual void SetSize(const gfx::Size& size) OVERRIDE; - virtual void StackAbove(gfx::NativeView native_view) OVERRIDE; - virtual void StackAtTop() OVERRIDE; - virtual void StackBelow(gfx::NativeView native_view) OVERRIDE; - virtual void SetShape(gfx::NativeRegion shape) OVERRIDE; - virtual void Close() OVERRIDE; - virtual void CloseNow() OVERRIDE; - virtual void Show() OVERRIDE; - virtual void Hide() OVERRIDE; + const gfx::ImageSkia& app_icon) override; + virtual void InitModalType(ui::ModalType modal_type) override; + virtual gfx::Rect GetWindowBoundsInScreen() const override; + virtual gfx::Rect GetClientAreaBoundsInScreen() const override; + virtual gfx::Rect GetRestoredBounds() const override; + virtual void SetBounds(const gfx::Rect& bounds) override; + virtual void SetSize(const gfx::Size& size) override; + virtual void StackAbove(gfx::NativeView native_view) override; + virtual void StackAtTop() override; + virtual void StackBelow(gfx::NativeView native_view) override; + virtual void SetShape(gfx::NativeRegion shape) override; + virtual void Close() override; + virtual void CloseNow() override; + virtual void Show() override; + virtual void Hide() override; virtual void ShowMaximizedWithBounds( - const gfx::Rect& restored_bounds) OVERRIDE; - virtual void ShowWithWindowState(ui::WindowShowState state) OVERRIDE; - virtual bool IsVisible() const OVERRIDE; - virtual void Activate() OVERRIDE; - virtual void Deactivate() OVERRIDE; - virtual bool IsActive() const OVERRIDE; - virtual void SetAlwaysOnTop(bool always_on_top) OVERRIDE; - virtual bool IsAlwaysOnTop() const OVERRIDE; - virtual void SetVisibleOnAllWorkspaces(bool always_visible) OVERRIDE; - virtual void Maximize() OVERRIDE; - virtual void Minimize() OVERRIDE; - virtual bool IsMaximized() const OVERRIDE; - virtual bool IsMinimized() const OVERRIDE; - virtual void Restore() OVERRIDE; - virtual void SetFullscreen(bool fullscreen) OVERRIDE; - virtual bool IsFullscreen() const OVERRIDE; - virtual void SetOpacity(unsigned char opacity) OVERRIDE; - virtual void SetUseDragFrame(bool use_drag_frame) OVERRIDE; - virtual void FlashFrame(bool flash_frame) OVERRIDE; + const gfx::Rect& restored_bounds) override; + virtual void ShowWithWindowState(ui::WindowShowState state) override; + virtual bool IsVisible() const override; + virtual void Activate() override; + virtual void Deactivate() override; + virtual bool IsActive() const override; + virtual void SetAlwaysOnTop(bool always_on_top) override; + virtual bool IsAlwaysOnTop() const override; + virtual void SetVisibleOnAllWorkspaces(bool always_visible) override; + virtual void Maximize() override; + virtual void Minimize() override; + virtual bool IsMaximized() const override; + virtual bool IsMinimized() const override; + virtual void Restore() override; + virtual void SetFullscreen(bool fullscreen) override; + virtual bool IsFullscreen() const override; + virtual void SetOpacity(unsigned char opacity) override; + virtual void SetUseDragFrame(bool use_drag_frame) override; + virtual void FlashFrame(bool flash_frame) override; virtual void RunShellDrag(View* view, const ui::OSExchangeData& data, const gfx::Point& location, int operation, - ui::DragDropTypes::DragEventSource source) OVERRIDE; - virtual void SchedulePaintInRect(const gfx::Rect& rect) OVERRIDE; - virtual void SetCursor(gfx::NativeCursor cursor) OVERRIDE; - virtual bool IsMouseEventsEnabled() const OVERRIDE; - virtual void ClearNativeFocus() OVERRIDE; - virtual gfx::Rect GetWorkAreaBoundsInScreen() const OVERRIDE; + ui::DragDropTypes::DragEventSource source) override; + virtual void SchedulePaintInRect(const gfx::Rect& rect) override; + virtual void SetCursor(gfx::NativeCursor cursor) override; + virtual bool IsMouseEventsEnabled() const override; + virtual void ClearNativeFocus() override; + virtual gfx::Rect GetWorkAreaBoundsInScreen() const override; virtual Widget::MoveLoopResult RunMoveLoop( const gfx::Vector2d& drag_offset, Widget::MoveLoopSource source, - Widget::MoveLoopEscapeBehavior escape_behavior) OVERRIDE; - virtual void EndMoveLoop() OVERRIDE; - virtual void SetVisibilityChangedAnimationsEnabled(bool value) OVERRIDE; - virtual ui::NativeTheme* GetNativeTheme() const OVERRIDE; - virtual void OnRootViewLayout() OVERRIDE; - virtual bool IsTranslucentWindowOpacitySupported() const OVERRIDE; - virtual void OnSizeConstraintsChanged() OVERRIDE; - virtual void RepostNativeEvent(gfx::NativeEvent native_event) OVERRIDE; + Widget::MoveLoopEscapeBehavior escape_behavior) override; + virtual void EndMoveLoop() override; + virtual void SetVisibilityChangedAnimationsEnabled(bool value) override; + virtual ui::NativeTheme* GetNativeTheme() const override; + virtual void OnRootViewLayout() override; + virtual bool IsTranslucentWindowOpacitySupported() const override; + virtual void OnSizeConstraintsChanged() override; + virtual void RepostNativeEvent(gfx::NativeEvent native_event) override; // Overridden from views::InputMethodDelegate: - virtual void DispatchKeyEventPostIME(const ui::KeyEvent& key) OVERRIDE; + virtual void DispatchKeyEventPostIME(const ui::KeyEvent& key) override; // Overridden from aura::WindowDelegate: - virtual gfx::Size GetMinimumSize() const OVERRIDE; - virtual gfx::Size GetMaximumSize() const OVERRIDE; + virtual gfx::Size GetMinimumSize() const override; + virtual gfx::Size GetMaximumSize() const override; virtual void OnBoundsChanged(const gfx::Rect& old_bounds, - const gfx::Rect& new_bounds) OVERRIDE; - virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE; - virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE; + const gfx::Rect& new_bounds) override; + virtual gfx::NativeCursor GetCursor(const gfx::Point& point) override; + virtual int GetNonClientComponent(const gfx::Point& point) const override; virtual bool ShouldDescendIntoChildForEventHandling( aura::Window* child, - const gfx::Point& location) OVERRIDE; - virtual bool CanFocus() OVERRIDE; - virtual void OnCaptureLost() OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; - virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE; - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; - virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; - virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE; - virtual bool HasHitTestMask() const OVERRIDE; - virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE; + const gfx::Point& location) override; + virtual bool CanFocus() override; + virtual void OnCaptureLost() override; + virtual void OnPaint(gfx::Canvas* canvas) override; + virtual void OnDeviceScaleFactorChanged(float device_scale_factor) override; + virtual void OnWindowDestroying(aura::Window* window) override; + virtual void OnWindowDestroyed(aura::Window* window) override; + virtual void OnWindowTargetVisibilityChanged(bool visible) override; + virtual bool HasHitTestMask() const override; + virtual void GetHitTestMask(gfx::Path* mask) const override; // Overridden from aura::WindowObserver: virtual void OnWindowPropertyChanged(aura::Window* window, const void* key, - intptr_t old) OVERRIDE; + intptr_t old) override; // Overridden from ui::EventHandler: - virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE; - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; - virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE; - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; + virtual void OnKeyEvent(ui::KeyEvent* event) override; + virtual void OnMouseEvent(ui::MouseEvent* event) override; + virtual void OnScrollEvent(ui::ScrollEvent* event) override; + virtual void OnGestureEvent(ui::GestureEvent* event) override; // Overridden from aura::client::ActivationDelegate: - virtual bool ShouldActivate() const OVERRIDE; + virtual bool ShouldActivate() const override; // Overridden from aura::client::ActivationChangeObserver: virtual void OnWindowActivated(aura::Window* gained_active, - aura::Window* lost_active) OVERRIDE; + aura::Window* lost_active) override; // Overridden from aura::client::FocusChangeObserver: virtual void OnWindowFocused(aura::Window* gained_focus, - aura::Window* lost_focus) OVERRIDE; + aura::Window* lost_focus) override; // Overridden from aura::client::DragDropDelegate: - virtual void OnDragEntered(const ui::DropTargetEvent& event) OVERRIDE; - virtual int OnDragUpdated(const ui::DropTargetEvent& event) OVERRIDE; - virtual void OnDragExited() OVERRIDE; - virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE; + virtual void OnDragEntered(const ui::DropTargetEvent& event) override; + virtual int OnDragUpdated(const ui::DropTargetEvent& event) override; + virtual void OnDragExited() override; + virtual int OnPerformDrop(const ui::DropTargetEvent& event) override; protected: virtual ~NativeWidgetAura(); diff --git a/ui/views/widget/native_widget_aura_unittest.cc b/ui/views/widget/native_widget_aura_unittest.cc index be0041d..6ca6f34 100644 --- a/ui/views/widget/native_widget_aura_unittest.cc +++ b/ui/views/widget/native_widget_aura_unittest.cc @@ -40,7 +40,7 @@ class NativeWidgetAuraTest : public aura::test::AuraTestBase { virtual ~NativeWidgetAuraTest() {} // testing::Test overrides: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { AuraTestBase::SetUp(); new wm::DefaultActivationClient(root_window()); host()->SetBounds(gfx::Rect(640, 480)); @@ -106,14 +106,14 @@ class TestLayoutManagerBase : public aura::LayoutManager { virtual ~TestLayoutManagerBase() {} // aura::LayoutManager: - virtual void OnWindowResized() OVERRIDE {} - virtual void OnWindowAddedToLayout(aura::Window* child) OVERRIDE {} - virtual void OnWillRemoveWindowFromLayout(aura::Window* child) OVERRIDE {} - virtual void OnWindowRemovedFromLayout(aura::Window* child) OVERRIDE {} + virtual void OnWindowResized() override {} + virtual void OnWindowAddedToLayout(aura::Window* child) override {} + virtual void OnWillRemoveWindowFromLayout(aura::Window* child) override {} + virtual void OnWindowRemovedFromLayout(aura::Window* child) override {} virtual void OnChildWindowVisibilityChanged(aura::Window* child, - bool visible) OVERRIDE {} + bool visible) override {} virtual void SetChildBounds(aura::Window* child, - const gfx::Rect& requested_bounds) OVERRIDE {} + const gfx::Rect& requested_bounds) override {} private: DISALLOW_COPY_AND_ASSIGN(TestLayoutManagerBase); @@ -127,7 +127,7 @@ class MaximizeLayoutManager : public TestLayoutManagerBase { private: // aura::LayoutManager: - virtual void OnWindowAddedToLayout(aura::Window* child) OVERRIDE { + virtual void OnWindowAddedToLayout(aura::Window* child) override { // This simulates what happens when adding a maximized window. SetChildBoundsDirect(child, gfx::Rect(0, 0, 300, 300)); } @@ -148,7 +148,7 @@ class TestWidget : public views::Widget { return did_size_change_more_than_once_; } - virtual void OnNativeWidgetSizeChanged(const gfx::Size& new_size) OVERRIDE { + virtual void OnNativeWidgetSizeChanged(const gfx::Size& new_size) override { if (last_size_.IsEmpty()) last_size_ = new_size; else if (!did_size_change_more_than_once_ && new_size != last_size_) @@ -191,7 +191,7 @@ class PropertyTestLayoutManager : public TestLayoutManagerBase { private: // aura::LayoutManager: - virtual void OnWindowAddedToLayout(aura::Window* child) OVERRIDE { + virtual void OnWindowAddedToLayout(aura::Window* child) override { EXPECT_TRUE(child->GetProperty(aura::client::kCanMaximizeKey)); EXPECT_TRUE(child->GetProperty(aura::client::kCanMinimizeKey)); EXPECT_TRUE(child->GetProperty(aura::client::kCanResizeKey)); @@ -210,22 +210,22 @@ class PropertyTestWidgetDelegate : public views::WidgetDelegate { private: // views::WidgetDelegate: - virtual bool CanMaximize() const OVERRIDE { + virtual bool CanMaximize() const override { return true; } - virtual bool CanMinimize() const OVERRIDE { + virtual bool CanMinimize() const override { return true; } - virtual bool CanResize() const OVERRIDE { + virtual bool CanResize() const override { return true; } - virtual void DeleteDelegate() OVERRIDE { + virtual void DeleteDelegate() override { delete this; } - virtual Widget* GetWidget() OVERRIDE { + virtual Widget* GetWidget() override { return widget_; } - virtual const Widget* GetWidget() const OVERRIDE { + virtual const Widget* GetWidget() const override { return widget_; } @@ -286,7 +286,7 @@ class GestureTrackingView : public views::View { } // View overrides: - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE { + virtual void OnGestureEvent(ui::GestureEvent* event) override { got_gesture_event_ = true; if (consume_gesture_event_) event->StopPropagation(); @@ -454,7 +454,7 @@ class MoveTestWidgetDelegate : public WidgetDelegateView { bool got_move() const { return got_move_; } // WidgetDelegate overrides: - virtual void OnWidgetMove() OVERRIDE { got_move_ = true; } + virtual void OnWidgetMove() override { got_move_ = true; } private: bool got_move_; diff --git a/ui/views/widget/native_widget_mac.h b/ui/views/widget/native_widget_mac.h index a7bbbac..a293eb8 100644 --- a/ui/views/widget/native_widget_mac.h +++ b/ui/views/widget/native_widget_mac.h @@ -25,92 +25,92 @@ class VIEWS_EXPORT NativeWidgetMac : public internal::NativeWidgetPrivate { void OnWindowWillClose(); // internal::NativeWidgetPrivate: - virtual void InitNativeWidget(const Widget::InitParams& params) OVERRIDE; - virtual NonClientFrameView* CreateNonClientFrameView() OVERRIDE; - virtual bool ShouldUseNativeFrame() const OVERRIDE; - virtual bool ShouldWindowContentsBeTransparent() const OVERRIDE; - virtual void FrameTypeChanged() OVERRIDE; - virtual Widget* GetWidget() OVERRIDE; - virtual const Widget* GetWidget() const OVERRIDE; - virtual gfx::NativeView GetNativeView() const OVERRIDE; - virtual gfx::NativeWindow GetNativeWindow() const OVERRIDE; - virtual Widget* GetTopLevelWidget() OVERRIDE; - virtual const ui::Compositor* GetCompositor() const OVERRIDE; - virtual ui::Compositor* GetCompositor() OVERRIDE; - virtual ui::Layer* GetLayer() OVERRIDE; - virtual void ReorderNativeViews() OVERRIDE; - virtual void ViewRemoved(View* view) OVERRIDE; - virtual void SetNativeWindowProperty(const char* name, void* value) OVERRIDE; - virtual void* GetNativeWindowProperty(const char* name) const OVERRIDE; - virtual TooltipManager* GetTooltipManager() const OVERRIDE; - virtual void SetCapture() OVERRIDE; - virtual void ReleaseCapture() OVERRIDE; - virtual bool HasCapture() const OVERRIDE; - virtual InputMethod* CreateInputMethod() OVERRIDE; - virtual internal::InputMethodDelegate* GetInputMethodDelegate() OVERRIDE; - virtual ui::InputMethod* GetHostInputMethod() OVERRIDE; - virtual void CenterWindow(const gfx::Size& size) OVERRIDE; + virtual void InitNativeWidget(const Widget::InitParams& params) override; + virtual NonClientFrameView* CreateNonClientFrameView() override; + virtual bool ShouldUseNativeFrame() const override; + virtual bool ShouldWindowContentsBeTransparent() const override; + virtual void FrameTypeChanged() override; + virtual Widget* GetWidget() override; + virtual const Widget* GetWidget() const override; + virtual gfx::NativeView GetNativeView() const override; + virtual gfx::NativeWindow GetNativeWindow() const override; + virtual Widget* GetTopLevelWidget() override; + virtual const ui::Compositor* GetCompositor() const override; + virtual ui::Compositor* GetCompositor() override; + virtual ui::Layer* GetLayer() override; + virtual void ReorderNativeViews() override; + virtual void ViewRemoved(View* view) override; + virtual void SetNativeWindowProperty(const char* name, void* value) override; + virtual void* GetNativeWindowProperty(const char* name) const override; + virtual TooltipManager* GetTooltipManager() const override; + virtual void SetCapture() override; + virtual void ReleaseCapture() override; + virtual bool HasCapture() const override; + virtual InputMethod* CreateInputMethod() override; + virtual internal::InputMethodDelegate* GetInputMethodDelegate() override; + virtual ui::InputMethod* GetHostInputMethod() override; + virtual void CenterWindow(const gfx::Size& size) override; virtual void GetWindowPlacement( gfx::Rect* bounds, - ui::WindowShowState* maximized) const OVERRIDE; - virtual bool SetWindowTitle(const base::string16& title) OVERRIDE; + ui::WindowShowState* maximized) const override; + virtual bool SetWindowTitle(const base::string16& title) override; virtual void SetWindowIcons(const gfx::ImageSkia& window_icon, - const gfx::ImageSkia& app_icon) OVERRIDE; - virtual void InitModalType(ui::ModalType modal_type) OVERRIDE; - virtual gfx::Rect GetWindowBoundsInScreen() const OVERRIDE; - virtual gfx::Rect GetClientAreaBoundsInScreen() const OVERRIDE; - virtual gfx::Rect GetRestoredBounds() const OVERRIDE; - virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; - virtual void SetSize(const gfx::Size& size) OVERRIDE; - virtual void StackAbove(gfx::NativeView native_view) OVERRIDE; - virtual void StackAtTop() OVERRIDE; - virtual void StackBelow(gfx::NativeView native_view) OVERRIDE; - virtual void SetShape(gfx::NativeRegion shape) OVERRIDE; - virtual void Close() OVERRIDE; - virtual void CloseNow() OVERRIDE; - virtual void Show() OVERRIDE; - virtual void Hide() OVERRIDE; + const gfx::ImageSkia& app_icon) override; + virtual void InitModalType(ui::ModalType modal_type) override; + virtual gfx::Rect GetWindowBoundsInScreen() const override; + virtual gfx::Rect GetClientAreaBoundsInScreen() const override; + virtual gfx::Rect GetRestoredBounds() const override; + virtual void SetBounds(const gfx::Rect& bounds) override; + virtual void SetSize(const gfx::Size& size) override; + virtual void StackAbove(gfx::NativeView native_view) override; + virtual void StackAtTop() override; + virtual void StackBelow(gfx::NativeView native_view) override; + virtual void SetShape(gfx::NativeRegion shape) override; + virtual void Close() override; + virtual void CloseNow() override; + virtual void Show() override; + virtual void Hide() override; virtual void ShowMaximizedWithBounds( - const gfx::Rect& restored_bounds) OVERRIDE; - virtual void ShowWithWindowState(ui::WindowShowState state) OVERRIDE; - virtual bool IsVisible() const OVERRIDE; - virtual void Activate() OVERRIDE; - virtual void Deactivate() OVERRIDE; - virtual bool IsActive() const OVERRIDE; - virtual void SetAlwaysOnTop(bool always_on_top) OVERRIDE; - virtual bool IsAlwaysOnTop() const OVERRIDE; - virtual void SetVisibleOnAllWorkspaces(bool always_visible) OVERRIDE; - virtual void Maximize() OVERRIDE; - virtual void Minimize() OVERRIDE; - virtual bool IsMaximized() const OVERRIDE; - virtual bool IsMinimized() const OVERRIDE; - virtual void Restore() OVERRIDE; - virtual void SetFullscreen(bool fullscreen) OVERRIDE; - virtual bool IsFullscreen() const OVERRIDE; - virtual void SetOpacity(unsigned char opacity) OVERRIDE; - virtual void SetUseDragFrame(bool use_drag_frame) OVERRIDE; - virtual void FlashFrame(bool flash_frame) OVERRIDE; + const gfx::Rect& restored_bounds) override; + virtual void ShowWithWindowState(ui::WindowShowState state) override; + virtual bool IsVisible() const override; + virtual void Activate() override; + virtual void Deactivate() override; + virtual bool IsActive() const override; + virtual void SetAlwaysOnTop(bool always_on_top) override; + virtual bool IsAlwaysOnTop() const override; + virtual void SetVisibleOnAllWorkspaces(bool always_visible) override; + virtual void Maximize() override; + virtual void Minimize() override; + virtual bool IsMaximized() const override; + virtual bool IsMinimized() const override; + virtual void Restore() override; + virtual void SetFullscreen(bool fullscreen) override; + virtual bool IsFullscreen() const override; + virtual void SetOpacity(unsigned char opacity) override; + virtual void SetUseDragFrame(bool use_drag_frame) override; + virtual void FlashFrame(bool flash_frame) override; virtual void RunShellDrag(View* view, const ui::OSExchangeData& data, const gfx::Point& location, int operation, - ui::DragDropTypes::DragEventSource source) OVERRIDE; - virtual void SchedulePaintInRect(const gfx::Rect& rect) OVERRIDE; - virtual void SetCursor(gfx::NativeCursor cursor) OVERRIDE; - virtual bool IsMouseEventsEnabled() const OVERRIDE; - virtual void ClearNativeFocus() OVERRIDE; - virtual gfx::Rect GetWorkAreaBoundsInScreen() const OVERRIDE; + ui::DragDropTypes::DragEventSource source) override; + virtual void SchedulePaintInRect(const gfx::Rect& rect) override; + virtual void SetCursor(gfx::NativeCursor cursor) override; + virtual bool IsMouseEventsEnabled() const override; + virtual void ClearNativeFocus() override; + virtual gfx::Rect GetWorkAreaBoundsInScreen() const override; virtual Widget::MoveLoopResult RunMoveLoop( const gfx::Vector2d& drag_offset, Widget::MoveLoopSource source, - Widget::MoveLoopEscapeBehavior escape_behavior) OVERRIDE; - virtual void EndMoveLoop() OVERRIDE; - virtual void SetVisibilityChangedAnimationsEnabled(bool value) OVERRIDE; - virtual ui::NativeTheme* GetNativeTheme() const OVERRIDE; - virtual void OnRootViewLayout() OVERRIDE; - virtual bool IsTranslucentWindowOpacitySupported() const OVERRIDE; - virtual void OnSizeConstraintsChanged() OVERRIDE; - virtual void RepostNativeEvent(gfx::NativeEvent native_event) OVERRIDE; + Widget::MoveLoopEscapeBehavior escape_behavior) override; + virtual void EndMoveLoop() override; + virtual void SetVisibilityChangedAnimationsEnabled(bool value) override; + virtual ui::NativeTheme* GetNativeTheme() const override; + virtual void OnRootViewLayout() override; + virtual bool IsTranslucentWindowOpacitySupported() const override; + virtual void OnSizeConstraintsChanged() override; + virtual void RepostNativeEvent(gfx::NativeEvent native_event) override; protected: internal::NativeWidgetDelegate* delegate() { return delegate_; } diff --git a/ui/views/widget/native_widget_private.h b/ui/views/widget/native_widget_private.h index ccb15b9..cd52012 100644 --- a/ui/views/widget/native_widget_private.h +++ b/ui/views/widget/native_widget_private.h @@ -231,7 +231,7 @@ class VIEWS_EXPORT NativeWidgetPrivate : public NativeWidget { virtual void RepostNativeEvent(gfx::NativeEvent native_event) = 0; // Overridden from NativeWidget: - virtual internal::NativeWidgetPrivate* AsNativeWidgetPrivate() OVERRIDE; + virtual internal::NativeWidgetPrivate* AsNativeWidgetPrivate() override; }; } // namespace internal diff --git a/ui/views/widget/root_view.cc b/ui/views/widget/root_view.cc index a1f0813..38fe053 100644 --- a/ui/views/widget/root_view.cc +++ b/ui/views/widget/root_view.cc @@ -64,7 +64,7 @@ class PreEventDispatchHandler : public ui::EventHandler { private: // ui::EventHandler: - virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE { + virtual void OnKeyEvent(ui::KeyEvent* event) override { CHECK_EQ(ui::EP_PRETARGET, event->phase()); if (event->handled()) return; @@ -106,7 +106,7 @@ class PostEventDispatchHandler : public ui::EventHandler { private: // Overridden from ui::EventHandler: - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE { + virtual void OnGestureEvent(ui::GestureEvent* event) override { DCHECK_EQ(ui::EP_POSTTARGET, event->phase()); if (event->handled()) return; diff --git a/ui/views/widget/root_view.h b/ui/views/widget/root_view.h index df01aea..ad2ca4c 100644 --- a/ui/views/widget/root_view.h +++ b/ui/views/widget/root_view.h @@ -87,42 +87,42 @@ class VIEWS_EXPORT RootView : public View, void LocaleChanged(); // Overridden from FocusTraversable: - virtual FocusSearch* GetFocusSearch() OVERRIDE; - virtual FocusTraversable* GetFocusTraversableParent() OVERRIDE; - virtual View* GetFocusTraversableParentView() OVERRIDE; + virtual FocusSearch* GetFocusSearch() override; + virtual FocusTraversable* GetFocusTraversableParent() override; + virtual View* GetFocusTraversableParentView() override; // Overridden from ui::EventProcessor: - virtual ui::EventTarget* GetRootTarget() OVERRIDE; - virtual void OnEventProcessingStarted(ui::Event* event) OVERRIDE; - virtual void OnEventProcessingFinished(ui::Event* event) OVERRIDE; + virtual ui::EventTarget* GetRootTarget() override; + virtual void OnEventProcessingStarted(ui::Event* event) override; + virtual void OnEventProcessingFinished(ui::Event* event) override; // Overridden from View: - virtual const Widget* GetWidget() const OVERRIDE; - virtual Widget* GetWidget() OVERRIDE; - virtual bool IsDrawn() const OVERRIDE; - virtual void Layout() OVERRIDE; - virtual const char* GetClassName() const OVERRIDE; - virtual void SchedulePaintInRect(const gfx::Rect& rect) OVERRIDE; - virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; - virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseCaptureLost() OVERRIDE; - virtual void OnMouseMoved(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE; - virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) OVERRIDE; - virtual void SetMouseHandler(View* new_mouse_handler) OVERRIDE; - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; - virtual void UpdateParentLayer() OVERRIDE; + virtual const Widget* GetWidget() const override; + virtual Widget* GetWidget() override; + virtual bool IsDrawn() const override; + virtual void Layout() override; + virtual const char* GetClassName() const override; + virtual void SchedulePaintInRect(const gfx::Rect& rect) override; + virtual bool OnMousePressed(const ui::MouseEvent& event) override; + virtual bool OnMouseDragged(const ui::MouseEvent& event) override; + virtual void OnMouseReleased(const ui::MouseEvent& event) override; + virtual void OnMouseCaptureLost() override; + virtual void OnMouseMoved(const ui::MouseEvent& event) override; + virtual void OnMouseExited(const ui::MouseEvent& event) override; + virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) override; + virtual void SetMouseHandler(View* new_mouse_handler) override; + virtual void GetAccessibleState(ui::AXViewState* state) override; + virtual void UpdateParentLayer() override; protected: // Overridden from View: virtual void ViewHierarchyChanged( - const ViewHierarchyChangedDetails& details) OVERRIDE; - virtual void VisibilityChanged(View* starting_from, bool is_visible) OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + const ViewHierarchyChangedDetails& details) override; + virtual void VisibilityChanged(View* starting_from, bool is_visible) override; + virtual void OnPaint(gfx::Canvas* canvas) override; virtual gfx::Vector2d CalculateOffsetToAncestorWithLayer( - ui::Layer** layer_parent) OVERRIDE; - virtual View::DragInfo* GetDragInfo() OVERRIDE; + ui::Layer** layer_parent) override; + virtual View::DragInfo* GetDragInfo() override; private: friend class ::views::RootViewTargeter; @@ -154,11 +154,11 @@ class VIEWS_EXPORT RootView : public View, View* sibling); // Overridden from ui::EventDispatcherDelegate: - virtual bool CanDispatchToTarget(ui::EventTarget* target) OVERRIDE; + virtual bool CanDispatchToTarget(ui::EventTarget* target) override; virtual ui::EventDispatchDetails PreDispatchEvent(ui::EventTarget* target, - ui::Event* event) OVERRIDE; + ui::Event* event) override; virtual ui::EventDispatchDetails PostDispatchEvent( - ui::EventTarget* target, const ui::Event& event) OVERRIDE; + ui::EventTarget* target, const ui::Event& event) override; ////////////////////////////////////////////////////////////////////////////// // Tree operations ----------------------------------------------------------- diff --git a/ui/views/widget/root_view_targeter.h b/ui/views/widget/root_view_targeter.h index e6cad9c..6b10a4e 100644 --- a/ui/views/widget/root_view_targeter.h +++ b/ui/views/widget/root_view_targeter.h @@ -31,10 +31,10 @@ class VIEWS_EXPORT RootViewTargeter : public ViewTargeter { // ViewTargeter: virtual View* FindTargetForGestureEvent( View* root, - const ui::GestureEvent& gesture) OVERRIDE; + const ui::GestureEvent& gesture) override; virtual ui::EventTarget* FindNextBestTargetForGestureEvent( ui::EventTarget* previous_target, - const ui::GestureEvent& gesture) OVERRIDE; + const ui::GestureEvent& gesture) override; // A pointer to the RootView on which |this| is installed. internal::RootView* root_view_; diff --git a/ui/views/widget/root_view_unittest.cc b/ui/views/widget/root_view_unittest.cc index f4836cd..21b1cc2 100644 --- a/ui/views/widget/root_view_unittest.cc +++ b/ui/views/widget/root_view_unittest.cc @@ -19,7 +19,7 @@ class DeleteOnKeyEventView : public View { explicit DeleteOnKeyEventView(bool* set_on_key) : set_on_key_(set_on_key) {} virtual ~DeleteOnKeyEventView() {} - virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE { + virtual bool OnKeyPressed(const ui::KeyEvent& event) override { *set_on_key_ = true; delete this; return true; @@ -89,7 +89,7 @@ class TestContextMenuController : public ContextMenuController { virtual void ShowContextMenuForView( View* source, const gfx::Point& point, - ui::MenuSourceType source_type) OVERRIDE { + ui::MenuSourceType source_type) override { show_context_menu_calls_++; menu_source_view_ = source; menu_source_type_ = source_type; @@ -163,7 +163,7 @@ class GestureHandlingView : public View { virtual ~GestureHandlingView() { } - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE { + virtual void OnGestureEvent(ui::GestureEvent* event) override { event->SetHandled(); } diff --git a/ui/views/widget/tooltip_manager_aura.h b/ui/views/widget/tooltip_manager_aura.h index e723299..73266a1 100644 --- a/ui/views/widget/tooltip_manager_aura.h +++ b/ui/views/widget/tooltip_manager_aura.h @@ -38,9 +38,9 @@ class TooltipManagerAura : public TooltipManager { static const gfx::FontList& GetDefaultFontList(); // TooltipManager: - virtual const gfx::FontList& GetFontList() const OVERRIDE; - virtual void UpdateTooltip() OVERRIDE; - virtual void TooltipTextChanged(View* view) OVERRIDE; + virtual const gfx::FontList& GetFontList() const override; + virtual void UpdateTooltip() override; + virtual void TooltipTextChanged(View* view) override; private: View* GetViewUnderPoint(const gfx::Point& point); diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc index 52209f8..8469f6d 100644 --- a/ui/views/widget/widget.cc +++ b/ui/views/widget/widget.cc @@ -74,16 +74,16 @@ class DefaultWidgetDelegate : public WidgetDelegate { virtual ~DefaultWidgetDelegate() {} // Overridden from WidgetDelegate: - virtual void DeleteDelegate() OVERRIDE { + virtual void DeleteDelegate() override { delete this; } - virtual Widget* GetWidget() OVERRIDE { + virtual Widget* GetWidget() override { return widget_; } - virtual const Widget* GetWidget() const OVERRIDE { + virtual const Widget* GetWidget() const override { return widget_; } - virtual bool ShouldAdvanceFocusToTopLevelWidget() const OVERRIDE { + virtual bool ShouldAdvanceFocusToTopLevelWidget() const override { // In most situations where a Widget is used without a delegate the Widget // is used as a container, so that we want focus to advance to the top-level // widget. A good example of this is the find bar. diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h index e785d7b..08ab939 100644 --- a/ui/views/widget/widget.h +++ b/ui/views/widget/widget.h @@ -742,55 +742,55 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate, virtual void OnOwnerClosing(); // Overridden from NativeWidgetDelegate: - virtual bool IsModal() const OVERRIDE; - virtual bool IsDialogBox() const OVERRIDE; - virtual bool CanActivate() const OVERRIDE; - virtual bool IsInactiveRenderingDisabled() const OVERRIDE; - virtual void EnableInactiveRendering() OVERRIDE; - virtual void OnNativeWidgetActivationChanged(bool active) OVERRIDE; - virtual void OnNativeFocus(gfx::NativeView old_focused_view) OVERRIDE; - virtual void OnNativeBlur(gfx::NativeView new_focused_view) OVERRIDE; - virtual void OnNativeWidgetVisibilityChanging(bool visible) OVERRIDE; - virtual void OnNativeWidgetVisibilityChanged(bool visible) OVERRIDE; - virtual void OnNativeWidgetCreated(bool desktop_widget) OVERRIDE; - virtual void OnNativeWidgetDestroying() OVERRIDE; - virtual void OnNativeWidgetDestroyed() OVERRIDE; - virtual gfx::Size GetMinimumSize() const OVERRIDE; - virtual gfx::Size GetMaximumSize() const OVERRIDE; - virtual void OnNativeWidgetMove() OVERRIDE; - virtual void OnNativeWidgetSizeChanged(const gfx::Size& new_size) OVERRIDE; - virtual void OnNativeWidgetWindowShowStateChanged() OVERRIDE; - virtual void OnNativeWidgetBeginUserBoundsChange() OVERRIDE; - virtual void OnNativeWidgetEndUserBoundsChange() OVERRIDE; - virtual bool HasFocusManager() const OVERRIDE; + virtual bool IsModal() const override; + virtual bool IsDialogBox() const override; + virtual bool CanActivate() const override; + virtual bool IsInactiveRenderingDisabled() const override; + virtual void EnableInactiveRendering() override; + virtual void OnNativeWidgetActivationChanged(bool active) override; + virtual void OnNativeFocus(gfx::NativeView old_focused_view) override; + virtual void OnNativeBlur(gfx::NativeView new_focused_view) override; + virtual void OnNativeWidgetVisibilityChanging(bool visible) override; + virtual void OnNativeWidgetVisibilityChanged(bool visible) override; + virtual void OnNativeWidgetCreated(bool desktop_widget) override; + virtual void OnNativeWidgetDestroying() override; + virtual void OnNativeWidgetDestroyed() override; + virtual gfx::Size GetMinimumSize() const override; + virtual gfx::Size GetMaximumSize() const override; + virtual void OnNativeWidgetMove() override; + virtual void OnNativeWidgetSizeChanged(const gfx::Size& new_size) override; + virtual void OnNativeWidgetWindowShowStateChanged() override; + virtual void OnNativeWidgetBeginUserBoundsChange() override; + virtual void OnNativeWidgetEndUserBoundsChange() override; + virtual bool HasFocusManager() const override; virtual bool OnNativeWidgetPaintAccelerated( - const gfx::Rect& dirty_region) OVERRIDE; - virtual void OnNativeWidgetPaint(gfx::Canvas* canvas) OVERRIDE; - virtual int GetNonClientComponent(const gfx::Point& point) OVERRIDE; - virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE; - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; - virtual void OnMouseCaptureLost() OVERRIDE; - virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE; - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; - virtual bool ExecuteCommand(int command_id) OVERRIDE; - virtual InputMethod* GetInputMethodDirect() OVERRIDE; - virtual const std::vector<ui::Layer*>& GetRootLayers() OVERRIDE; - virtual bool HasHitTestMask() const OVERRIDE; - virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE; - virtual Widget* AsWidget() OVERRIDE; - virtual const Widget* AsWidget() const OVERRIDE; - virtual bool SetInitialFocus(ui::WindowShowState show_state) OVERRIDE; + const gfx::Rect& dirty_region) override; + virtual void OnNativeWidgetPaint(gfx::Canvas* canvas) override; + virtual int GetNonClientComponent(const gfx::Point& point) override; + virtual void OnKeyEvent(ui::KeyEvent* event) override; + virtual void OnMouseEvent(ui::MouseEvent* event) override; + virtual void OnMouseCaptureLost() override; + virtual void OnScrollEvent(ui::ScrollEvent* event) override; + virtual void OnGestureEvent(ui::GestureEvent* event) override; + virtual bool ExecuteCommand(int command_id) override; + virtual InputMethod* GetInputMethodDirect() override; + virtual const std::vector<ui::Layer*>& GetRootLayers() override; + virtual bool HasHitTestMask() const override; + virtual void GetHitTestMask(gfx::Path* mask) const override; + virtual Widget* AsWidget() override; + virtual const Widget* AsWidget() const override; + virtual bool SetInitialFocus(ui::WindowShowState show_state) override; // Overridden from ui::EventSource: - virtual ui::EventProcessor* GetEventProcessor() OVERRIDE; + virtual ui::EventProcessor* GetEventProcessor() override; // Overridden from FocusTraversable: - virtual FocusSearch* GetFocusSearch() OVERRIDE; - virtual FocusTraversable* GetFocusTraversableParent() OVERRIDE; - virtual View* GetFocusTraversableParentView() OVERRIDE; + virtual FocusSearch* GetFocusSearch() override; + virtual FocusTraversable* GetFocusTraversableParent() override; + virtual View* GetFocusTraversableParentView() override; // Overridden from ui::NativeThemeObserver: - virtual void OnNativeThemeUpdated(ui::NativeTheme* observed_theme) OVERRIDE; + virtual void OnNativeThemeUpdated(ui::NativeTheme* observed_theme) override; protected: // Creates the RootView to be used within this Widget. Subclasses may override diff --git a/ui/views/widget/widget_delegate.h b/ui/views/widget/widget_delegate.h index 422c286..3f67cb4 100644 --- a/ui/views/widget/widget_delegate.h +++ b/ui/views/widget/widget_delegate.h @@ -204,9 +204,9 @@ class VIEWS_EXPORT WidgetDelegateView : public WidgetDelegate, public View { virtual ~WidgetDelegateView(); // Overridden from WidgetDelegate: - virtual void DeleteDelegate() OVERRIDE; - virtual Widget* GetWidget() OVERRIDE; - virtual const Widget* GetWidget() const OVERRIDE; + virtual void DeleteDelegate() override; + virtual Widget* GetWidget() override; + virtual const Widget* GetWidget() const override; private: DISALLOW_COPY_AND_ASSIGN(WidgetDelegateView); diff --git a/ui/views/widget/widget_deletion_observer.h b/ui/views/widget/widget_deletion_observer.h index 7182d2d..785e132 100644 --- a/ui/views/widget/widget_deletion_observer.h +++ b/ui/views/widget/widget_deletion_observer.h @@ -23,7 +23,7 @@ class VIEWS_EXPORT WidgetDeletionObserver : public WidgetObserver { bool IsWidgetAlive() { return widget_ != NULL; } // Overridden from WidgetObserver. - virtual void OnWidgetDestroying(Widget* widget) OVERRIDE; + virtual void OnWidgetDestroying(Widget* widget) override; private: void CleanupWidget(); diff --git a/ui/views/widget/widget_interactive_uitest.cc b/ui/views/widget/widget_interactive_uitest.cc index 68d646c..681f1d1 100644 --- a/ui/views/widget/widget_interactive_uitest.cc +++ b/ui/views/widget/widget_interactive_uitest.cc @@ -47,7 +47,7 @@ class ExitLoopOnRelease : public View { private: // Overridden from View: - virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE { + virtual void OnMouseReleased(const ui::MouseEvent& event) override { GetWidget()->Close(); base::MessageLoop::current()->QuitNow(); } @@ -63,7 +63,7 @@ class GestureCaptureView : public View { private: // Overridden from View: - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE { + virtual void OnGestureEvent(ui::GestureEvent* event) override { if (event->type() == ui::ET_GESTURE_TAP_DOWN) { GetWidget()->SetCapture(this); event->StopPropagation(); @@ -84,16 +84,16 @@ class MouseView : public View { } virtual ~MouseView() {} - virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE { + virtual bool OnMousePressed(const ui::MouseEvent& event) override { pressed_++; return true; } - virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE { + virtual void OnMouseEntered(const ui::MouseEvent& event) override { entered_++; } - virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE { + virtual void OnMouseExited(const ui::MouseEvent& event) override { exited_++; } @@ -131,7 +131,7 @@ class NestedLoopCaptureView : public View { private: // Overridden from View: - virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE { + virtual bool OnMousePressed(const ui::MouseEvent& event) override { // Start a nested loop. widget_->Show(); widget_->SetCapture(widget_->GetContentsView()); @@ -157,7 +157,7 @@ class WidgetTestInteractive : public WidgetTest { WidgetTestInteractive() {} virtual ~WidgetTestInteractive() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { gfx::GLSurface::InitializeOneOffForTests(); ui::RegisterPathProvider(); base::FilePath ui_test_pak_path; @@ -587,7 +587,7 @@ class WidgetActivationTest : public Widget { virtual ~WidgetActivationTest() {} - virtual void OnNativeWidgetActivationChanged(bool active) OVERRIDE { + virtual void OnNativeWidgetActivationChanged(bool active) override { active_ = active; } @@ -640,7 +640,7 @@ class ModalDialogDelegate : public DialogDelegateView { virtual ~ModalDialogDelegate() {} // WidgetDelegate overrides. - virtual ui::ModalType GetModalType() const OVERRIDE { + virtual ui::ModalType GetModalType() const override { return type_; } @@ -867,7 +867,7 @@ class CaptureLostTrackingWidget : public Widget { } // Widget: - virtual void OnMouseCaptureLost() OVERRIDE { + virtual void OnMouseCaptureLost() override { got_capture_lost_ = true; Widget::OnMouseCaptureLost(); } @@ -888,7 +888,7 @@ class WidgetCaptureTest : public ViewsTestBase { virtual ~WidgetCaptureTest() { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { gfx::GLSurface::InitializeOneOffForTests(); ui::RegisterPathProvider(); base::FilePath ui_test_pak_path; @@ -1048,7 +1048,7 @@ class CaptureOnActivationObserver : public WidgetObserver { } // WidgetObserver: - virtual void OnWidgetActivationChanged(Widget* widget, bool active) OVERRIDE { + virtual void OnWidgetActivationChanged(Widget* widget, bool active) override { if (active) widget->SetCapture(NULL); } @@ -1101,7 +1101,7 @@ class MouseEventTrackingWidget : public Widget { } // Widget: - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE { + virtual void OnMouseEvent(ui::MouseEvent* event) override { got_mouse_event_ = true; Widget::OnMouseEvent(event); } diff --git a/ui/views/widget/widget_unittest.cc b/ui/views/widget/widget_unittest.cc index 5bcc006..edf5c09 100644 --- a/ui/views/widget/widget_unittest.cc +++ b/ui/views/widget/widget_unittest.cc @@ -87,23 +87,23 @@ class EventCountView : public View { protected: // Overridden from View: - virtual void OnMouseMoved(const ui::MouseEvent& event) OVERRIDE { + virtual void OnMouseMoved(const ui::MouseEvent& event) override { // MouseMove events are not re-dispatched from the RootView. ++event_count_[ui::ET_MOUSE_MOVED]; last_flags_ = 0; } // Overridden from ui::EventHandler: - virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE { + virtual void OnKeyEvent(ui::KeyEvent* event) override { RecordEvent(event); } - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE { + virtual void OnMouseEvent(ui::MouseEvent* event) override { RecordEvent(event); } - virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE { + virtual void OnScrollEvent(ui::ScrollEvent* event) override { RecordEvent(event); } - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE { + virtual void OnGestureEvent(ui::GestureEvent* event) override { RecordEvent(event); } @@ -131,7 +131,7 @@ class ScrollableEventCountView : public EventCountView { private: // Overridden from ui::EventHandler: - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE { + virtual void OnGestureEvent(ui::GestureEvent* event) override { EventCountView::OnGestureEvent(event); switch (event->type()) { case ui::ET_GESTURE_SCROLL_BEGIN: @@ -145,7 +145,7 @@ class ScrollableEventCountView : public EventCountView { } } - virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE { + virtual void OnScrollEvent(ui::ScrollEvent* event) override { EventCountView::OnScrollEvent(event); if (event->type() == ui::ET_SCROLL) event->SetHandled(); @@ -162,7 +162,7 @@ class MinimumSizeFrameView : public NativeFrameView { private: // Overridden from View: - virtual gfx::Size GetMinimumSize() const OVERRIDE { + virtual gfx::Size GetMinimumSize() const override { return gfx::Size(300, 400); } @@ -186,7 +186,7 @@ class EventCountHandler : public ui::EventHandler { protected: // Overridden from ui::EventHandler: - virtual void OnEvent(ui::Event* event) OVERRIDE { + virtual void OnEvent(ui::Event* event) override { RecordEvent(*event); ui::EventHandler::OnEvent(event); } @@ -210,7 +210,7 @@ class CloseWidgetView : public View { } // ui::EventHandler override: - virtual void OnEvent(ui::Event* event) OVERRIDE { + virtual void OnEvent(ui::Event* event) override { if (event->type() == event_type_) { // Go through NativeWidgetPrivate to simulate what happens if the OS // deletes the NativeWindow out from under us. @@ -718,14 +718,14 @@ class WidgetObserverTest : public WidgetTest, public WidgetObserver { virtual ~WidgetObserverTest() {} // Overridden from WidgetObserver: - virtual void OnWidgetDestroying(Widget* widget) OVERRIDE { + virtual void OnWidgetDestroying(Widget* widget) override { if (active_ == widget) active_ = NULL; widget_closed_ = widget; } virtual void OnWidgetActivationChanged(Widget* widget, - bool active) OVERRIDE { + bool active) override { if (active) { if (widget_activated_) widget_activated_->Deactivate(); @@ -739,7 +739,7 @@ class WidgetObserverTest : public WidgetTest, public WidgetObserver { } virtual void OnWidgetVisibilityChanged(Widget* widget, - bool visible) OVERRIDE { + bool visible) override { if (visible) widget_shown_ = widget; else @@ -747,7 +747,7 @@ class WidgetObserverTest : public WidgetTest, public WidgetObserver { } virtual void OnWidgetBoundsChanged(Widget* widget, - const gfx::Rect& new_bounds) OVERRIDE { + const gfx::Rect& new_bounds) override { widget_bounds_changed_ = widget; } @@ -1062,7 +1062,7 @@ class TestBubbleDelegateView : public BubbleDelegateView { reset_controls_called_(false) {} virtual ~TestBubbleDelegateView() {} - virtual bool ShouldShowCloseButton() const OVERRIDE { + virtual bool ShouldShowCloseButton() const override { reset_controls_called_ = true; return true; } @@ -1120,12 +1120,12 @@ class DesktopAuraTestValidPaintWidget : public views::Widget { virtual ~DesktopAuraTestValidPaintWidget() { } - virtual void Show() OVERRIDE { + virtual void Show() override { expect_paint_ = true; views::Widget::Show(); } - virtual void Close() OVERRIDE { + virtual void Close() override { expect_paint_ = false; views::Widget::Close(); } @@ -1135,7 +1135,7 @@ class DesktopAuraTestValidPaintWidget : public views::Widget { views::Widget::Hide(); } - virtual void OnNativeWidgetPaint(gfx::Canvas* canvas) OVERRIDE { + virtual void OnNativeWidgetPaint(gfx::Canvas* canvas) override { EXPECT_TRUE(expect_paint_); if (!expect_paint_) received_paint_while_hidden_ = true; @@ -1551,7 +1551,7 @@ class MousePressEventConsumer : public ui::EventHandler { private: // ui::EventHandler: - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE { + virtual void OnMouseEvent(ui::MouseEvent* event) override { if (event->type() == ui::ET_MOUSE_PRESSED) event->SetHandled(); } @@ -1596,9 +1596,9 @@ class ClosingDelegate : public WidgetDelegate { void set_widget(views::Widget* widget) { widget_ = widget; } // WidgetDelegate overrides: - virtual Widget* GetWidget() OVERRIDE { return widget_; } - virtual const Widget* GetWidget() const OVERRIDE { return widget_; } - virtual void WindowClosing() OVERRIDE { + virtual Widget* GetWidget() override { return widget_; } + virtual const Widget* GetWidget() const override { return widget_; } + virtual void WindowClosing() override { count_++; } @@ -1732,7 +1732,7 @@ class GetNativeThemeFromDestructorView : public WidgetDelegateView { VerifyNativeTheme(); } - virtual View* GetContentsView() OVERRIDE { + virtual View* GetContentsView() override { return this; } @@ -1807,7 +1807,7 @@ class AnimationEndObserver : public ui::ImplicitAnimationObserver { bool animation_completed() const { return animation_completed_; } // ui::ImplicitAnimationObserver: - virtual void OnImplicitAnimationsCompleted() OVERRIDE { + virtual void OnImplicitAnimationsCompleted() override { animation_completed_ = true; } @@ -1826,7 +1826,7 @@ class WidgetBoundsObserver : public WidgetObserver { gfx::Rect bounds() { return bounds_; } // WidgetObserver: - virtual void OnWidgetDestroying(Widget* widget) OVERRIDE { + virtual void OnWidgetDestroying(Widget* widget) override { bounds_ = widget->GetWindowBoundsInScreen(); } @@ -1897,11 +1897,11 @@ class RootViewTestView : public View { RootViewTestView(): View() {} private: - virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE { + virtual bool OnMousePressed(const ui::MouseEvent& event) override { return true; } - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE { + virtual void OnGestureEvent(ui::GestureEvent* event) override { if (event->type() == ui::ET_GESTURE_TAP_DOWN) event->SetHandled(); } @@ -2447,7 +2447,7 @@ class GestureLocationView : public EventCountView { } // EventCountView: - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE { + virtual void OnGestureEvent(ui::GestureEvent* event) override { EventCountView::OnGestureEvent(event); // Verify that the location of |event| is in the local coordinate @@ -2774,7 +2774,7 @@ class ModalDialogDelegate : public DialogDelegateView { virtual ~ModalDialogDelegate() {} // WidgetDelegate overrides. - virtual ui::ModalType GetModalType() const OVERRIDE { + virtual ui::ModalType GetModalType() const override { return ui::MODAL_TYPE_WINDOW; } @@ -2903,19 +2903,19 @@ class ModalWindowTestWidgetDelegate : public WidgetDelegate { virtual ~ModalWindowTestWidgetDelegate() {} // Overridden from WidgetDelegate: - virtual void DeleteDelegate() OVERRIDE { + virtual void DeleteDelegate() override { delete this; } - virtual Widget* GetWidget() OVERRIDE { + virtual Widget* GetWidget() override { return widget_; } - virtual const Widget* GetWidget() const OVERRIDE { + virtual const Widget* GetWidget() const override { return widget_; } - virtual bool CanActivate() const OVERRIDE { + virtual bool CanActivate() const override { return can_activate_; } - virtual bool ShouldAdvanceFocusToTopLevelWidget() const OVERRIDE { + virtual bool ShouldAdvanceFocusToTopLevelWidget() const override { return true; } @@ -3086,25 +3086,25 @@ class FullscreenAwareFrame : public views::NonClientFrameView { virtual ~FullscreenAwareFrame() {} // views::NonClientFrameView overrides: - virtual gfx::Rect GetBoundsForClientView() const OVERRIDE { + virtual gfx::Rect GetBoundsForClientView() const override { return gfx::Rect(); } virtual gfx::Rect GetWindowBoundsForClientBounds( - const gfx::Rect& client_bounds) const OVERRIDE { + const gfx::Rect& client_bounds) const override { return gfx::Rect(); } - virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE { + virtual int NonClientHitTest(const gfx::Point& point) override { return HTNOWHERE; } virtual void GetWindowMask(const gfx::Size& size, - gfx::Path* window_mask) OVERRIDE {} - virtual void ResetWindowControls() OVERRIDE {} - virtual void UpdateWindowIcon() OVERRIDE {} - virtual void UpdateWindowTitle() OVERRIDE {} - virtual void SizeConstraintsChanged() OVERRIDE {} + gfx::Path* window_mask) override {} + virtual void ResetWindowControls() override {} + virtual void UpdateWindowIcon() override {} + virtual void UpdateWindowTitle() override {} + virtual void SizeConstraintsChanged() override {} // views::View overrides: - virtual void Layout() OVERRIDE { + virtual void Layout() override { if (widget_->IsFullscreen()) fullscreen_layout_called_ = true; } @@ -3148,7 +3148,7 @@ class IsActiveFromDestroyObserver : public WidgetObserver { public: IsActiveFromDestroyObserver() {} virtual ~IsActiveFromDestroyObserver() {} - virtual void OnWidgetDestroying(Widget* widget) OVERRIDE { + virtual void OnWidgetDestroying(Widget* widget) override { widget->IsActive(); } diff --git a/ui/views/widget/window_reorderer.cc b/ui/views/widget/window_reorderer.cc index dcf51c8..098796c 100644 --- a/ui/views/widget/window_reorderer.cc +++ b/ui/views/widget/window_reorderer.cc @@ -71,8 +71,8 @@ class WindowReorderer::AssociationObserver : public aura::WindowObserver { // aura::WindowObserver overrides: virtual void OnWindowPropertyChanged(aura::Window* window, const void* key, - intptr_t old) OVERRIDE; - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; + intptr_t old) override; + virtual void OnWindowDestroying(aura::Window* window) override; // Not owned. WindowReorderer* reorderer_; diff --git a/ui/views/widget/window_reorderer.h b/ui/views/widget/window_reorderer.h index b04e48f..5091cf4 100644 --- a/ui/views/widget/window_reorderer.h +++ b/ui/views/widget/window_reorderer.h @@ -37,9 +37,9 @@ class WindowReorderer : public aura::WindowObserver { private: // aura::WindowObserver overrides: - virtual void OnWindowAdded(aura::Window* new_window) OVERRIDE; - virtual void OnWillRemoveWindow(aura::Window* window) OVERRIDE; - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; + virtual void OnWindowAdded(aura::Window* new_window) override; + virtual void OnWillRemoveWindow(aura::Window* window) override; + virtual void OnWindowDestroying(aura::Window* window) override; // The window and the root view of the native widget which owns the // WindowReorderer. diff --git a/ui/views/win/hwnd_message_handler.h b/ui/views/win/hwnd_message_handler.h index f19dfef..86d3d52 100644 --- a/ui/views/win/hwnd_message_handler.h +++ b/ui/views/win/hwnd_message_handler.h @@ -212,37 +212,37 @@ class VIEWS_EXPORT HWNDMessageHandler : typedef std::set<DWORD> TouchIDs; // Overridden from internal::InputMethodDelegate: - virtual void DispatchKeyEventPostIME(const ui::KeyEvent& key) OVERRIDE; + virtual void DispatchKeyEventPostIME(const ui::KeyEvent& key) override; // Overridden from WindowImpl: - virtual HICON GetDefaultWindowIcon() const OVERRIDE; + virtual HICON GetDefaultWindowIcon() const override; virtual LRESULT OnWndProc(UINT message, WPARAM w_param, - LPARAM l_param) OVERRIDE; + LPARAM l_param) override; // Overridden from WindowEventTarget virtual LRESULT HandleMouseMessage(unsigned int message, WPARAM w_param, LPARAM l_param, - bool* handled) OVERRIDE; + bool* handled) override; virtual LRESULT HandleKeyboardMessage(unsigned int message, WPARAM w_param, LPARAM l_param, - bool* handled) OVERRIDE; + bool* handled) override; virtual LRESULT HandleTouchMessage(unsigned int message, WPARAM w_param, LPARAM l_param, - bool* handled) OVERRIDE; + bool* handled) override; virtual LRESULT HandleScrollMessage(unsigned int message, WPARAM w_param, LPARAM l_param, - bool* handled) OVERRIDE; + bool* handled) override; virtual LRESULT HandleNcHitTestMessage(unsigned int message, WPARAM w_param, LPARAM l_param, - bool* handled) OVERRIDE; + bool* handled) override; // Returns the auto-hide edges of the appbar. See // ViewsDelegate::GetAppbarAutohideEdges() for details. If the edges change, diff --git a/ui/views/window/client_view.h b/ui/views/window/client_view.h index 5a329aa..53d393b 100644 --- a/ui/views/window/client_view.h +++ b/ui/views/window/client_view.h @@ -57,18 +57,18 @@ class VIEWS_EXPORT ClientView : public View { virtual int NonClientHitTest(const gfx::Point& point); // Overridden from View: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual gfx::Size GetMinimumSize() const OVERRIDE; - virtual gfx::Size GetMaximumSize() const OVERRIDE; - virtual void Layout() OVERRIDE; - virtual const char* GetClassName() const OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual gfx::Size GetMinimumSize() const override; + virtual gfx::Size GetMaximumSize() const override; + virtual void Layout() override; + virtual const char* GetClassName() const override; protected: // Overridden from View: - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; - virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE; + virtual void GetAccessibleState(ui::AXViewState* state) override; + virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) override; virtual void ViewHierarchyChanged( - const ViewHierarchyChangedDetails& details) OVERRIDE; + const ViewHierarchyChangedDetails& details) override; // Accessors for private data members. View* contents_view() const { return contents_view_; } diff --git a/ui/views/window/custom_frame_view.h b/ui/views/window/custom_frame_view.h index f2f738b..a09dd33 100644 --- a/ui/views/window/custom_frame_view.h +++ b/ui/views/window/custom_frame_view.h @@ -39,26 +39,26 @@ class VIEWS_EXPORT CustomFrameView : public NonClientFrameView, void Init(Widget* frame); // Overridden from NonClientFrameView: - virtual gfx::Rect GetBoundsForClientView() const OVERRIDE; + virtual gfx::Rect GetBoundsForClientView() const override; virtual gfx::Rect GetWindowBoundsForClientBounds( - const gfx::Rect& client_bounds) const OVERRIDE; - virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE; + const gfx::Rect& client_bounds) const override; + virtual int NonClientHitTest(const gfx::Point& point) override; virtual void GetWindowMask(const gfx::Size& size, - gfx::Path* window_mask) OVERRIDE; - virtual void ResetWindowControls() OVERRIDE; - virtual void UpdateWindowIcon() OVERRIDE; - virtual void UpdateWindowTitle() OVERRIDE; - virtual void SizeConstraintsChanged() OVERRIDE; + gfx::Path* window_mask) override; + virtual void ResetWindowControls() override; + virtual void UpdateWindowIcon() override; + virtual void UpdateWindowTitle() override; + virtual void SizeConstraintsChanged() override; // Overridden from View: - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; - virtual void Layout() OVERRIDE; - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual gfx::Size GetMinimumSize() const OVERRIDE; - virtual gfx::Size GetMaximumSize() const OVERRIDE; + virtual void OnPaint(gfx::Canvas* canvas) override; + virtual void Layout() override; + virtual gfx::Size GetPreferredSize() const override; + virtual gfx::Size GetMinimumSize() const override; + virtual gfx::Size GetMaximumSize() const override; // Overridden from ButtonListener: - virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; + virtual void ButtonPressed(Button* sender, const ui::Event& event) override; private: friend class CustomFrameViewTest; diff --git a/ui/views/window/custom_frame_view_unittest.cc b/ui/views/window/custom_frame_view_unittest.cc index f4dc37a..68c79e8 100644 --- a/ui/views/window/custom_frame_view_unittest.cc +++ b/ui/views/window/custom_frame_view_unittest.cc @@ -35,8 +35,8 @@ class MinimizeAndMaximizeStateControlDelegate : public WidgetDelegateView { } // WidgetDelegate: - virtual bool CanMaximize() const OVERRIDE { return can_maximize_; } - virtual bool CanMinimize() const OVERRIDE { return can_minimize_; } + virtual bool CanMaximize() const override { return can_maximize_; } + virtual bool CanMinimize() const override { return can_minimize_; } private: bool can_maximize_; @@ -66,8 +66,8 @@ class CustomFrameViewTest : public ViewsTestBase { } // ViewsTestBase: - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; protected: const std::vector<views::FrameButton>& leading_buttons() { diff --git a/ui/views/window/dialog_client_view.h b/ui/views/window/dialog_client_view.h index 1e8ced1..bf38f25 100644 --- a/ui/views/window/dialog_client_view.h +++ b/ui/views/window/dialog_client_view.h @@ -46,27 +46,27 @@ class VIEWS_EXPORT DialogClientView : public ClientView, void UpdateDialogButtons(); // ClientView implementation: - virtual bool CanClose() OVERRIDE; - virtual DialogClientView* AsDialogClientView() OVERRIDE; - virtual const DialogClientView* AsDialogClientView() const OVERRIDE; + virtual bool CanClose() override; + virtual DialogClientView* AsDialogClientView() override; + virtual const DialogClientView* AsDialogClientView() const override; // FocusChangeListener implementation: virtual void OnWillChangeFocus(View* focused_before, - View* focused_now) OVERRIDE; + View* focused_now) override; virtual void OnDidChangeFocus(View* focused_before, - View* focused_now) OVERRIDE; + View* focused_now) override; // View implementation: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual void Layout() OVERRIDE; - virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual void Layout() override; + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) override; virtual void ViewHierarchyChanged( - const ViewHierarchyChangedDetails& details) OVERRIDE; - virtual void NativeViewHierarchyChanged() OVERRIDE; - virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) OVERRIDE; + const ViewHierarchyChangedDetails& details) override; + virtual void NativeViewHierarchyChanged() override; + virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) override; // ButtonListener implementation: - virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; + virtual void ButtonPressed(Button* sender, const ui::Event& event) override; protected: // For testing. @@ -82,8 +82,8 @@ class VIEWS_EXPORT DialogClientView : public ClientView, void CreateFootnoteView(); // View implementation. - virtual void ChildPreferredSizeChanged(View* child) OVERRIDE; - virtual void ChildVisibilityChanged(View* child) OVERRIDE; + virtual void ChildPreferredSizeChanged(View* child) override; + virtual void ChildVisibilityChanged(View* child) override; private: FRIEND_TEST_ALL_PREFIXES(DialogClientViewTest, FocusManager); diff --git a/ui/views/window/dialog_client_view_unittest.cc b/ui/views/window/dialog_client_view_unittest.cc index 28b001f..6f4812cb 100644 --- a/ui/views/window/dialog_client_view_unittest.cc +++ b/ui/views/window/dialog_client_view_unittest.cc @@ -23,7 +23,7 @@ class TestDialogClientView : public DialogClientView { virtual ~TestDialogClientView() {} // DialogClientView implementation. - virtual DialogDelegate* GetDialogDelegate() const OVERRIDE { return dialog_; } + virtual DialogDelegate* GetDialogDelegate() const override { return dialog_; } View* GetContentsView() { return contents_view(); } @@ -48,7 +48,7 @@ class DialogClientViewTest : public ViewsTestBase, virtual ~DialogClientViewTest() {} // testing::Test implementation. - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { dialog_buttons_ = ui::DIALOG_BUTTON_NONE; contents_.reset(new StaticSizedView(gfx::Size(100, 200))); client_view_.reset(new TestDialogClientView(contents_.get(), this)); @@ -57,10 +57,10 @@ class DialogClientViewTest : public ViewsTestBase, } // DialogDelegateView implementation. - virtual View* GetContentsView() OVERRIDE { return contents_.get(); } - virtual View* CreateExtraView() OVERRIDE { return extra_view_; } - virtual View* CreateFootnoteView() OVERRIDE { return footnote_view_; } - virtual int GetDialogButtons() const OVERRIDE { return dialog_buttons_; } + virtual View* GetContentsView() override { return contents_.get(); } + virtual View* CreateExtraView() override { return extra_view_; } + virtual View* CreateFootnoteView() override { return footnote_view_; } + virtual int GetDialogButtons() const override { return dialog_buttons_; } protected: gfx::Rect GetUpdatedClientBounds() { diff --git a/ui/views/window/dialog_delegate.h b/ui/views/window/dialog_delegate.h index 8a2533e..d2294c2 100644 --- a/ui/views/window/dialog_delegate.h +++ b/ui/views/window/dialog_delegate.h @@ -83,20 +83,20 @@ class VIEWS_EXPORT DialogDelegate : public ui::DialogModel, virtual bool Close(); // Overridden from ui::DialogModel: - virtual base::string16 GetDialogLabel() const OVERRIDE; - virtual base::string16 GetDialogTitle() const OVERRIDE; - virtual int GetDialogButtons() const OVERRIDE; - virtual int GetDefaultDialogButton() const OVERRIDE; - virtual bool ShouldDefaultButtonBeBlue() const OVERRIDE; + virtual base::string16 GetDialogLabel() const override; + virtual base::string16 GetDialogTitle() const override; + virtual int GetDialogButtons() const override; + virtual int GetDefaultDialogButton() const override; + virtual bool ShouldDefaultButtonBeBlue() const override; virtual base::string16 GetDialogButtonLabel( - ui::DialogButton button) const OVERRIDE; - virtual bool IsDialogButtonEnabled(ui::DialogButton button) const OVERRIDE; + ui::DialogButton button) const override; + virtual bool IsDialogButtonEnabled(ui::DialogButton button) const override; // Overridden from WidgetDelegate: - virtual View* GetInitiallyFocusedView() OVERRIDE; - virtual DialogDelegate* AsDialogDelegate() OVERRIDE; - virtual ClientView* CreateClientView(Widget* widget) OVERRIDE; - virtual NonClientFrameView* CreateNonClientFrameView(Widget* widget) OVERRIDE; + virtual View* GetInitiallyFocusedView() override; + virtual DialogDelegate* AsDialogDelegate() override; + virtual ClientView* CreateClientView(Widget* widget) override; + virtual NonClientFrameView* CreateNonClientFrameView(Widget* widget) override; // Create a frame view using the new dialog style. static NonClientFrameView* CreateDialogFrameView(Widget* widget); @@ -114,7 +114,7 @@ class VIEWS_EXPORT DialogDelegate : public ui::DialogModel, protected: // Overridden from WidgetDelegate: - virtual ui::AXRole GetAccessibleWindowRole() const OVERRIDE; + virtual ui::AXRole GetAccessibleWindowRole() const override; private: // A flag indicating whether this dialog supports the new style. @@ -132,10 +132,10 @@ class VIEWS_EXPORT DialogDelegateView : public DialogDelegate, virtual ~DialogDelegateView(); // Overridden from DialogDelegate: - virtual void DeleteDelegate() OVERRIDE; - virtual Widget* GetWidget() OVERRIDE; - virtual const Widget* GetWidget() const OVERRIDE; - virtual View* GetContentsView() OVERRIDE; + virtual void DeleteDelegate() override; + virtual Widget* GetWidget() override; + virtual const Widget* GetWidget() const override; + virtual View* GetContentsView() override; private: DISALLOW_COPY_AND_ASSIGN(DialogDelegateView); diff --git a/ui/views/window/dialog_delegate_unittest.cc b/ui/views/window/dialog_delegate_unittest.cc index b355104..bbfa66b 100644 --- a/ui/views/window/dialog_delegate_unittest.cc +++ b/ui/views/window/dialog_delegate_unittest.cc @@ -27,24 +27,24 @@ class TestDialog : public DialogDelegateView, public ButtonListener { virtual ~TestDialog() {} // DialogDelegateView overrides: - virtual bool Cancel() OVERRIDE { + virtual bool Cancel() override { canceled_ = true; return closeable_; } - virtual bool Accept() OVERRIDE { + virtual bool Accept() override { accepted_ = true; return closeable_; } // DialogDelegateView overrides: - virtual gfx::Size GetPreferredSize() const OVERRIDE { + virtual gfx::Size GetPreferredSize() const override { return gfx::Size(200, 200); } - virtual base::string16 GetWindowTitle() const OVERRIDE { return title_; } - virtual bool UseNewStyleForThisDialog() const OVERRIDE { return true; } + virtual base::string16 GetWindowTitle() const override { return title_; } + virtual bool UseNewStyleForThisDialog() const override { return true; } // ButtonListener override: - virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE { + virtual void ButtonPressed(Button* sender, const ui::Event& event) override { last_pressed_button_ = sender; } @@ -94,13 +94,13 @@ class DialogTest : public ViewsTestBase { DialogTest() : dialog_(NULL) {} virtual ~DialogTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ViewsTestBase::SetUp(); dialog_ = new TestDialog(); DialogDelegate::CreateDialogWidget(dialog_, GetContext(), NULL)->Show(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { dialog_->TearDown(); ViewsTestBase::TearDown(); } diff --git a/ui/views/window/native_frame_view.h b/ui/views/window/native_frame_view.h index 444bf96..3f4d09a 100644 --- a/ui/views/window/native_frame_view.h +++ b/ui/views/window/native_frame_view.h @@ -19,22 +19,22 @@ class VIEWS_EXPORT NativeFrameView : public NonClientFrameView { virtual ~NativeFrameView(); // NonClientFrameView overrides: - virtual gfx::Rect GetBoundsForClientView() const OVERRIDE; + virtual gfx::Rect GetBoundsForClientView() const override; virtual gfx::Rect GetWindowBoundsForClientBounds( - const gfx::Rect& client_bounds) const OVERRIDE; - virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE; + const gfx::Rect& client_bounds) const override; + virtual int NonClientHitTest(const gfx::Point& point) override; virtual void GetWindowMask(const gfx::Size& size, - gfx::Path* window_mask) OVERRIDE; - virtual void ResetWindowControls() OVERRIDE; - virtual void UpdateWindowIcon() OVERRIDE; - virtual void UpdateWindowTitle() OVERRIDE; - virtual void SizeConstraintsChanged() OVERRIDE; + gfx::Path* window_mask) override; + virtual void ResetWindowControls() override; + virtual void UpdateWindowIcon() override; + virtual void UpdateWindowTitle() override; + virtual void SizeConstraintsChanged() override; // View overrides: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual gfx::Size GetMinimumSize() const OVERRIDE; - virtual gfx::Size GetMaximumSize() const OVERRIDE; - virtual const char* GetClassName() const OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual gfx::Size GetMinimumSize() const override; + virtual gfx::Size GetMaximumSize() const override; + virtual const char* GetClassName() const override; private: // Our containing frame. diff --git a/ui/views/window/non_client_view.h b/ui/views/window/non_client_view.h index 434b782..99a6880 100644 --- a/ui/views/window/non_client_view.h +++ b/ui/views/window/non_client_view.h @@ -82,18 +82,18 @@ class VIEWS_EXPORT NonClientFrameView : public View, virtual void SizeConstraintsChanged() = 0; // View: - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; - virtual const char* GetClassName() const OVERRIDE; + virtual void GetAccessibleState(ui::AXViewState* state) override; + virtual const char* GetClassName() const override; protected: NonClientFrameView(); // ViewTargeterDelegate: virtual bool DoesIntersectRect(const View* target, - const gfx::Rect& rect) const OVERRIDE; + const gfx::Rect& rect) const override; // View: - virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE; + virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) override; private: // Prevents the non-client frame view from being rendered as inactive when @@ -215,24 +215,24 @@ class VIEWS_EXPORT NonClientView : public View, public ViewTargeterDelegate { void SetAccessibleName(const base::string16& name); // NonClientView, View overrides: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual gfx::Size GetMinimumSize() const OVERRIDE; - virtual gfx::Size GetMaximumSize() const OVERRIDE; - virtual void Layout() OVERRIDE; - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; - virtual const char* GetClassName() const OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual gfx::Size GetMinimumSize() const override; + virtual gfx::Size GetMaximumSize() const override; + virtual void Layout() override; + virtual void GetAccessibleState(ui::AXViewState* state) override; + virtual const char* GetClassName() const override; virtual views::View* GetTooltipHandlerForPoint( - const gfx::Point& point) OVERRIDE; + const gfx::Point& point) override; protected: // NonClientView, View overrides: virtual void ViewHierarchyChanged( - const ViewHierarchyChangedDetails& details) OVERRIDE; + const ViewHierarchyChangedDetails& details) override; private: // ViewTargeterDelegate: - virtual View* TargetForRect(View* root, const gfx::Rect& rect) OVERRIDE; + virtual View* TargetForRect(View* root, const gfx::Rect& rect) override; // A ClientView object or subclass, responsible for sizing the contents view // of the window, hit testing and perhaps other tasks depending on the diff --git a/ui/views_content_client/views_content_browser_client.h b/ui/views_content_client/views_content_browser_client.h index f01cd3a..a24ece9 100644 --- a/ui/views_content_client/views_content_browser_client.h +++ b/ui/views_content_client/views_content_browser_client.h @@ -25,11 +25,11 @@ class ViewsContentBrowserClient : public content::ContentBrowserClient { // content::ContentBrowserClient: virtual content::BrowserMainParts* CreateBrowserMainParts( - const content::MainFunctionParams& parameters) OVERRIDE; + const content::MainFunctionParams& parameters) override; virtual net::URLRequestContextGetter* CreateRequestContext( content::BrowserContext* browser_context, content::ProtocolHandlerMap* protocol_handlers, - content::URLRequestInterceptorScopedVector request_interceptors) OVERRIDE; + content::URLRequestInterceptorScopedVector request_interceptors) override; private: ViewsContentClientMainParts* views_content_main_parts_; diff --git a/ui/views_content_client/views_content_client_main_parts.h b/ui/views_content_client/views_content_client_main_parts.h index 113e352..1e9ad4d 100644 --- a/ui/views_content_client/views_content_client_main_parts.h +++ b/ui/views_content_client/views_content_client_main_parts.h @@ -32,9 +32,9 @@ class ViewsContentClientMainParts : public content::BrowserMainParts { virtual ~ViewsContentClientMainParts(); // content::BrowserMainParts: - virtual void PreMainMessageLoopRun() OVERRIDE; - virtual bool MainMessageLoopRun(int* result_code) OVERRIDE; - virtual void PostMainMessageLoopRun() OVERRIDE; + virtual void PreMainMessageLoopRun() override; + virtual bool MainMessageLoopRun(int* result_code) override; + virtual void PostMainMessageLoopRun() override; content::ShellBrowserContext* browser_context() { return browser_context_.get(); diff --git a/ui/views_content_client/views_content_client_main_parts_aura.h b/ui/views_content_client/views_content_client_main_parts_aura.h index 06b273a..4a8f56dc 100644 --- a/ui/views_content_client/views_content_client_main_parts_aura.h +++ b/ui/views_content_client/views_content_client_main_parts_aura.h @@ -23,8 +23,8 @@ class ViewsContentClientMainPartsAura : public ViewsContentClientMainParts { virtual ~ViewsContentClientMainPartsAura(); // content::BrowserMainParts: - virtual void ToolkitInitialized() OVERRIDE; - virtual void PostMainMessageLoopRun() OVERRIDE; + virtual void ToolkitInitialized() override; + virtual void PostMainMessageLoopRun() override; private: scoped_ptr< ::wm::WMState> wm_state_; diff --git a/ui/views_content_client/views_content_client_main_parts_chromeos.cc b/ui/views_content_client/views_content_client_main_parts_chromeos.cc index b2d304e..5198eeb 100644 --- a/ui/views_content_client/views_content_client_main_parts_chromeos.cc +++ b/ui/views_content_client/views_content_client_main_parts_chromeos.cc @@ -25,7 +25,7 @@ class NestedAcceleratorDelegate : public ::wm::NestedAcceleratorDelegate { // ::wm::NestedAcceleratorDelegate: virtual Result ProcessAccelerator( - const ui::Accelerator& accelerator) OVERRIDE { + const ui::Accelerator& accelerator) override { return RESULT_NOT_PROCESSED; } @@ -42,8 +42,8 @@ class ViewsContentClientMainPartsChromeOS virtual ~ViewsContentClientMainPartsChromeOS() {} // content::BrowserMainParts: - virtual void PreMainMessageLoopRun() OVERRIDE; - virtual void PostMainMessageLoopRun() OVERRIDE; + virtual void PreMainMessageLoopRun() override; + virtual void PostMainMessageLoopRun() override; private: // Enable a minimal set of views::corewm to be initialized. diff --git a/ui/views_content_client/views_content_client_main_parts_desktop_aura.cc b/ui/views_content_client/views_content_client_main_parts_desktop_aura.cc index ec8b75b..cb2293b 100644 --- a/ui/views_content_client/views_content_client_main_parts_desktop_aura.cc +++ b/ui/views_content_client/views_content_client_main_parts_desktop_aura.cc @@ -22,7 +22,7 @@ class ViewsContentClientMainPartsDesktopAura virtual ~ViewsContentClientMainPartsDesktopAura() {} // content::BrowserMainParts: - virtual void PreMainMessageLoopRun() OVERRIDE; + virtual void PreMainMessageLoopRun() override; private: DISALLOW_COPY_AND_ASSIGN(ViewsContentClientMainPartsDesktopAura); diff --git a/ui/views_content_client/views_content_client_main_parts_mac.mm b/ui/views_content_client/views_content_client_main_parts_mac.mm index 2c86c37..de793a3 100644 --- a/ui/views_content_client/views_content_client_main_parts_mac.mm +++ b/ui/views_content_client/views_content_client_main_parts_mac.mm @@ -36,7 +36,7 @@ class ViewsContentClientMainPartsMac : public ViewsContentClientMainParts { virtual ~ViewsContentClientMainPartsMac(); // content::BrowserMainParts: - virtual void PreMainMessageLoopRun() OVERRIDE; + virtual void PreMainMessageLoopRun() override; private: base::scoped_nsobject<ViewsContentClientAppController> app_controller_; diff --git a/ui/views_content_client/views_content_main_delegate.h b/ui/views_content_client/views_content_main_delegate.h index f56eece..646201a 100644 --- a/ui/views_content_client/views_content_main_delegate.h +++ b/ui/views_content_client/views_content_main_delegate.h @@ -21,9 +21,9 @@ class ViewsContentMainDelegate : public content::ContentMainDelegate { virtual ~ViewsContentMainDelegate(); // content::ContentMainDelegate implementation - virtual bool BasicStartupComplete(int* exit_code) OVERRIDE; - virtual void PreSandboxStartup() OVERRIDE; - virtual content::ContentBrowserClient* CreateContentBrowserClient() OVERRIDE; + virtual bool BasicStartupComplete(int* exit_code) override; + virtual void PreSandboxStartup() override; + virtual content::ContentBrowserClient* CreateContentBrowserClient() override; private: scoped_ptr<ViewsContentBrowserClient> browser_client_; diff --git a/ui/web_dialogs/test/test_web_contents_handler.h b/ui/web_dialogs/test/test_web_contents_handler.h index abe2c73..86e197b 100644 --- a/ui/web_dialogs/test/test_web_contents_handler.h +++ b/ui/web_dialogs/test/test_web_contents_handler.h @@ -23,13 +23,13 @@ class TestWebContentsHandler virtual content::WebContents* OpenURLFromTab( content::BrowserContext* context, content::WebContents* source, - const content::OpenURLParams& params) OVERRIDE; + const content::OpenURLParams& params) override; virtual void AddNewContents(content::BrowserContext* context, content::WebContents* source, content::WebContents* new_contents, WindowOpenDisposition disposition, const gfx::Rect& initial_pos, - bool user_gesture) OVERRIDE; + bool user_gesture) override; DISALLOW_COPY_AND_ASSIGN(TestWebContentsHandler); }; diff --git a/ui/web_dialogs/test/test_web_dialog_delegate.h b/ui/web_dialogs/test/test_web_dialog_delegate.h index 18a73b2..b289536 100644 --- a/ui/web_dialogs/test/test_web_dialog_delegate.h +++ b/ui/web_dialogs/test/test_web_dialog_delegate.h @@ -25,17 +25,17 @@ class TestWebDialogDelegate : public WebDialogDelegate { } // WebDialogDelegate implementation: - virtual ModalType GetDialogModalType() const OVERRIDE; - virtual base::string16 GetDialogTitle() const OVERRIDE; - virtual GURL GetDialogContentURL() const OVERRIDE; + virtual ModalType GetDialogModalType() const override; + virtual base::string16 GetDialogTitle() const override; + virtual GURL GetDialogContentURL() const override; virtual void GetWebUIMessageHandlers( - std::vector<content::WebUIMessageHandler*>* handlers) const OVERRIDE; - virtual void GetDialogSize(gfx::Size* size) const OVERRIDE; - virtual std::string GetDialogArgs() const OVERRIDE; - virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE; + std::vector<content::WebUIMessageHandler*>* handlers) const override; + virtual void GetDialogSize(gfx::Size* size) const override; + virtual std::string GetDialogArgs() const override; + virtual void OnDialogClosed(const std::string& json_retval) override; virtual void OnCloseContents(content::WebContents* source, - bool* out_close_dialog) OVERRIDE; - virtual bool ShouldShowDialogTitle() const OVERRIDE; + bool* out_close_dialog) override; + virtual bool ShouldShowDialogTitle() const override; protected: const GURL url_; diff --git a/ui/web_dialogs/web_dialog_ui.h b/ui/web_dialogs/web_dialog_ui.h index 99dce4f..144b8c7 100644 --- a/ui/web_dialogs/web_dialog_ui.h +++ b/ui/web_dialogs/web_dialog_ui.h @@ -69,7 +69,7 @@ class WEB_DIALOGS_EXPORT WebDialogUI : public content::WebUIController { private: // WebUIController virtual void RenderViewCreated( - content::RenderViewHost* render_view_host) OVERRIDE; + content::RenderViewHost* render_view_host) override; // Gets the delegate for the WebContent set with SetDelegate. static WebDialogDelegate* GetDelegate(content::WebContents* web_contents); diff --git a/ui/web_dialogs/web_dialog_web_contents_delegate.h b/ui/web_dialogs/web_dialog_web_contents_delegate.h index 50b4a65..d5ed725 100644 --- a/ui/web_dialogs/web_dialog_web_contents_delegate.h +++ b/ui/web_dialogs/web_dialog_web_contents_delegate.h @@ -55,18 +55,18 @@ class WEB_DIALOGS_EXPORT WebDialogWebContentsDelegate // content::WebContentsDelegate declarations. virtual content::WebContents* OpenURLFromTab( content::WebContents* source, - const content::OpenURLParams& params) OVERRIDE; + const content::OpenURLParams& params) override; virtual void AddNewContents(content::WebContents* source, content::WebContents* new_contents, WindowOpenDisposition disposition, const gfx::Rect& initial_pos, bool user_gesture, - bool* was_blocked) OVERRIDE; + bool* was_blocked) override; virtual bool IsPopupOrPanel( - const content::WebContents* source) const OVERRIDE; + const content::WebContents* source) const override; virtual bool PreHandleGestureEvent( content::WebContents* source, - const blink::WebGestureEvent& event) OVERRIDE; + const blink::WebGestureEvent& event) override; private: // Weak pointer. Always an original profile. diff --git a/ui/wm/core/accelerator_filter.h b/ui/wm/core/accelerator_filter.h index 4e5295e..0ac7605 100644 --- a/ui/wm/core/accelerator_filter.h +++ b/ui/wm/core/accelerator_filter.h @@ -25,7 +25,7 @@ class WM_EXPORT AcceleratorFilter : public ui::EventHandler { virtual ~AcceleratorFilter(); // Overridden from ui::EventHandler: - virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE; + virtual void OnKeyEvent(ui::KeyEvent* event) override; private: scoped_ptr<AcceleratorDelegate> delegate_; diff --git a/ui/wm/core/base_focus_rules.h b/ui/wm/core/base_focus_rules.h index 07dfb65..8073541 100644 --- a/ui/wm/core/base_focus_rules.h +++ b/ui/wm/core/base_focus_rules.h @@ -26,15 +26,15 @@ class WM_EXPORT BaseFocusRules : public FocusRules { aura::Window* window) const; // Overridden from FocusRules: - virtual bool IsToplevelWindow(aura::Window* window) const OVERRIDE; - virtual bool CanActivateWindow(aura::Window* window) const OVERRIDE; - virtual bool CanFocusWindow(aura::Window* window) const OVERRIDE; - virtual aura::Window* GetToplevelWindow(aura::Window* window) const OVERRIDE; + virtual bool IsToplevelWindow(aura::Window* window) const override; + virtual bool CanActivateWindow(aura::Window* window) const override; + virtual bool CanFocusWindow(aura::Window* window) const override; + virtual aura::Window* GetToplevelWindow(aura::Window* window) const override; virtual aura::Window* GetActivatableWindow( - aura::Window* window) const OVERRIDE; - virtual aura::Window* GetFocusableWindow(aura::Window* window) const OVERRIDE; + aura::Window* window) const override; + virtual aura::Window* GetFocusableWindow(aura::Window* window) const override; virtual aura::Window* GetNextActivatableWindow( - aura::Window* ignore) const OVERRIDE; + aura::Window* ignore) const override; private: DISALLOW_COPY_AND_ASSIGN(BaseFocusRules); diff --git a/ui/wm/core/capture_controller.h b/ui/wm/core/capture_controller.h index d802818..230ea50 100644 --- a/ui/wm/core/capture_controller.h +++ b/ui/wm/core/capture_controller.h @@ -29,10 +29,10 @@ class WM_EXPORT CaptureController : public aura::client::CaptureClient { bool is_active() const { return !root_windows_.empty(); } // Overridden from aura::client::CaptureClient: - virtual void SetCapture(aura::Window* window) OVERRIDE; - virtual void ReleaseCapture(aura::Window* window) OVERRIDE; - virtual aura::Window* GetCaptureWindow() OVERRIDE; - virtual aura::Window* GetGlobalCaptureWindow() OVERRIDE; + virtual void SetCapture(aura::Window* window) override; + virtual void ReleaseCapture(aura::Window* window) override; + virtual aura::Window* GetCaptureWindow() override; + virtual aura::Window* GetGlobalCaptureWindow() override; private: friend class ScopedCaptureClient; @@ -66,7 +66,7 @@ class WM_EXPORT ScopedCaptureClient : public aura::WindowObserver { } // Overridden from aura::WindowObserver: - virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; + virtual void OnWindowDestroyed(aura::Window* window) override; private: // Invoked from destructor and OnWindowDestroyed() to cleanup. diff --git a/ui/wm/core/compound_event_filter.h b/ui/wm/core/compound_event_filter.h index ab4fdf8..a7767f3 100644 --- a/ui/wm/core/compound_event_filter.h +++ b/ui/wm/core/compound_event_filter.h @@ -73,11 +73,11 @@ class WM_EXPORT CompoundEventFilter : public ui::EventHandler { bool enable); // Overridden from ui::EventHandler: - virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE; - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; - virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE; - virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE; - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; + virtual void OnKeyEvent(ui::KeyEvent* event) override; + virtual void OnMouseEvent(ui::MouseEvent* event) override; + virtual void OnScrollEvent(ui::ScrollEvent* event) override; + virtual void OnTouchEvent(ui::TouchEvent* event) override; + virtual void OnGestureEvent(ui::GestureEvent* event) override; // Additional pre-target event handlers. ObserverList<ui::EventHandler, true> handlers_; diff --git a/ui/wm/core/compound_event_filter_unittest.cc b/ui/wm/core/compound_event_filter_unittest.cc index 85282fc..05f75e9 100644 --- a/ui/wm/core/compound_event_filter_unittest.cc +++ b/ui/wm/core/compound_event_filter_unittest.cc @@ -39,7 +39,7 @@ class ConsumeGestureEventFilter : public ui::EventHandler { private: // Overridden from ui::EventHandler: - virtual void OnGestureEvent(ui::GestureEvent* e) OVERRIDE { + virtual void OnGestureEvent(ui::GestureEvent* e) override { e->StopPropagation(); } diff --git a/ui/wm/core/cursor_manager.h b/ui/wm/core/cursor_manager.h index f60ef14..4f9c21b 100644 --- a/ui/wm/core/cursor_manager.h +++ b/ui/wm/core/cursor_manager.h @@ -43,33 +43,33 @@ class WM_EXPORT CursorManager : public aura::client::CursorClient, virtual ~CursorManager(); // Overridden from aura::client::CursorClient: - virtual void SetCursor(gfx::NativeCursor) OVERRIDE; - virtual gfx::NativeCursor GetCursor() const OVERRIDE; - virtual void ShowCursor() OVERRIDE; - virtual void HideCursor() OVERRIDE; - virtual bool IsCursorVisible() const OVERRIDE; - virtual void SetCursorSet(ui::CursorSetType cursor_set) OVERRIDE; - virtual ui::CursorSetType GetCursorSet() const OVERRIDE; - virtual void EnableMouseEvents() OVERRIDE; - virtual void DisableMouseEvents() OVERRIDE; - virtual bool IsMouseEventsEnabled() const OVERRIDE; - virtual void SetDisplay(const gfx::Display& display) OVERRIDE; - virtual void LockCursor() OVERRIDE; - virtual void UnlockCursor() OVERRIDE; - virtual bool IsCursorLocked() const OVERRIDE; + virtual void SetCursor(gfx::NativeCursor) override; + virtual gfx::NativeCursor GetCursor() const override; + virtual void ShowCursor() override; + virtual void HideCursor() override; + virtual bool IsCursorVisible() const override; + virtual void SetCursorSet(ui::CursorSetType cursor_set) override; + virtual ui::CursorSetType GetCursorSet() const override; + virtual void EnableMouseEvents() override; + virtual void DisableMouseEvents() override; + virtual bool IsMouseEventsEnabled() const override; + virtual void SetDisplay(const gfx::Display& display) override; + virtual void LockCursor() override; + virtual void UnlockCursor() override; + virtual bool IsCursorLocked() const override; virtual void AddObserver( - aura::client::CursorClientObserver* observer) OVERRIDE; + aura::client::CursorClientObserver* observer) override; virtual void RemoveObserver( - aura::client::CursorClientObserver* observer) OVERRIDE; + aura::client::CursorClientObserver* observer) override; virtual bool ShouldHideCursorOnKeyEvent( - const ui::KeyEvent& event) const OVERRIDE; + const ui::KeyEvent& event) const override; private: // Overridden from NativeCursorManagerDelegate: - virtual void CommitCursor(gfx::NativeCursor cursor) OVERRIDE; - virtual void CommitVisibility(bool visible) OVERRIDE; - virtual void CommitCursorSet(ui::CursorSetType cursor_set) OVERRIDE; - virtual void CommitMouseEventsEnabled(bool enabled) OVERRIDE; + virtual void CommitCursor(gfx::NativeCursor cursor) override; + virtual void CommitVisibility(bool visible) override; + virtual void CommitCursorSet(ui::CursorSetType cursor_set) override; + virtual void CommitMouseEventsEnabled(bool enabled) override; scoped_ptr<NativeCursorManager> delegate_; diff --git a/ui/wm/core/cursor_manager_unittest.cc b/ui/wm/core/cursor_manager_unittest.cc index 58c3b17..8dd2aa8 100644 --- a/ui/wm/core/cursor_manager_unittest.cc +++ b/ui/wm/core/cursor_manager_unittest.cc @@ -15,29 +15,29 @@ class TestingCursorManager : public wm::NativeCursorManager { // Overridden from wm::NativeCursorManager: virtual void SetDisplay( const gfx::Display& display, - wm::NativeCursorManagerDelegate* delegate) OVERRIDE {} + wm::NativeCursorManagerDelegate* delegate) override {} virtual void SetCursor( gfx::NativeCursor cursor, - wm::NativeCursorManagerDelegate* delegate) OVERRIDE { + wm::NativeCursorManagerDelegate* delegate) override { delegate->CommitCursor(cursor); } virtual void SetVisibility( bool visible, - wm::NativeCursorManagerDelegate* delegate) OVERRIDE { + wm::NativeCursorManagerDelegate* delegate) override { delegate->CommitVisibility(visible); } virtual void SetMouseEventsEnabled( bool enabled, - wm::NativeCursorManagerDelegate* delegate) OVERRIDE { + wm::NativeCursorManagerDelegate* delegate) override { delegate->CommitMouseEventsEnabled(enabled); } virtual void SetCursorSet( ui::CursorSetType cursor_set, - wm::NativeCursorManagerDelegate* delegate) OVERRIDE { + wm::NativeCursorManagerDelegate* delegate) override { delegate->CommitCursorSet(cursor_set); } }; @@ -66,7 +66,7 @@ class TestingCursorClientObserver : public aura::client::CursorClientObserver { bool did_visibility_change() const { return did_visibility_change_; } // Overridden from aura::client::CursorClientObserver: - virtual void OnCursorVisibilityChanged(bool is_visible) OVERRIDE { + virtual void OnCursorVisibilityChanged(bool is_visible) override { cursor_visibility_ = is_visible; did_visibility_change_ = true; } diff --git a/ui/wm/core/default_activation_client.cc b/ui/wm/core/default_activation_client.cc index 94af0a5..d6383d6 100644 --- a/ui/wm/core/default_activation_client.cc +++ b/ui/wm/core/default_activation_client.cc @@ -23,7 +23,7 @@ class DefaultActivationClient::Deleter : public aura::WindowObserver { virtual ~Deleter() {} // Overridden from WindowObserver: - virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE { + virtual void OnWindowDestroyed(aura::Window* window) override { DCHECK_EQ(window, root_window_); root_window_->RemoveObserver(this); delete client_; diff --git a/ui/wm/core/default_activation_client.h b/ui/wm/core/default_activation_client.h index 13b2474..fb9f9e2 100644 --- a/ui/wm/core/default_activation_client.h +++ b/ui/wm/core/default_activation_client.h @@ -33,18 +33,18 @@ class WM_EXPORT DefaultActivationClient : public aura::client::ActivationClient, // Overridden from aura::client::ActivationClient: virtual void AddObserver( - aura::client::ActivationChangeObserver* observer) OVERRIDE; + aura::client::ActivationChangeObserver* observer) override; virtual void RemoveObserver( - aura::client::ActivationChangeObserver* observer) OVERRIDE; - virtual void ActivateWindow(aura::Window* window) OVERRIDE; - virtual void DeactivateWindow(aura::Window* window) OVERRIDE; - virtual aura::Window* GetActiveWindow() OVERRIDE; - virtual aura::Window* GetActivatableWindow(aura::Window* window) OVERRIDE; - virtual aura::Window* GetToplevelWindow(aura::Window* window) OVERRIDE; - virtual bool CanActivateWindow(aura::Window* window) const OVERRIDE; + aura::client::ActivationChangeObserver* observer) override; + virtual void ActivateWindow(aura::Window* window) override; + virtual void DeactivateWindow(aura::Window* window) override; + virtual aura::Window* GetActiveWindow() override; + virtual aura::Window* GetActivatableWindow(aura::Window* window) override; + virtual aura::Window* GetToplevelWindow(aura::Window* window) override; + virtual bool CanActivateWindow(aura::Window* window) const override; // Overridden from WindowObserver: - virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; + virtual void OnWindowDestroyed(aura::Window* window) override; private: class Deleter; diff --git a/ui/wm/core/easy_resize_window_targeter.h b/ui/wm/core/easy_resize_window_targeter.h index 35b9eb2..5693300 100644 --- a/ui/wm/core/easy_resize_window_targeter.h +++ b/ui/wm/core/easy_resize_window_targeter.h @@ -34,7 +34,7 @@ class WM_EXPORT EasyResizeWindowTargeter : public aura::WindowTargeter { // ui::EventTargeter: virtual bool EventLocationInsideBounds( ui::EventTarget* target, - const ui::LocatedEvent& event) const OVERRIDE; + const ui::LocatedEvent& event) const override; private: // Returns true if the hit testing (EventLocationInsideBounds()) should use diff --git a/ui/wm/core/focus_controller.h b/ui/wm/core/focus_controller.h index 2f1aa0e..9e4149f 100644 --- a/ui/wm/core/focus_controller.h +++ b/ui/wm/core/focus_controller.h @@ -46,40 +46,40 @@ class WM_EXPORT FocusController : public aura::client::ActivationClient, private: // Overridden from aura::client::ActivationClient: virtual void AddObserver( - aura::client::ActivationChangeObserver* observer) OVERRIDE; + aura::client::ActivationChangeObserver* observer) override; virtual void RemoveObserver( - aura::client::ActivationChangeObserver* observer) OVERRIDE; - virtual void ActivateWindow(aura::Window* window) OVERRIDE; - virtual void DeactivateWindow(aura::Window* window) OVERRIDE; - virtual aura::Window* GetActiveWindow() OVERRIDE; - virtual aura::Window* GetActivatableWindow(aura::Window* window) OVERRIDE; - virtual aura::Window* GetToplevelWindow(aura::Window* window) OVERRIDE; - virtual bool CanActivateWindow(aura::Window* window) const OVERRIDE; + aura::client::ActivationChangeObserver* observer) override; + virtual void ActivateWindow(aura::Window* window) override; + virtual void DeactivateWindow(aura::Window* window) override; + virtual aura::Window* GetActiveWindow() override; + virtual aura::Window* GetActivatableWindow(aura::Window* window) override; + virtual aura::Window* GetToplevelWindow(aura::Window* window) override; + virtual bool CanActivateWindow(aura::Window* window) const override; // Overridden from aura::client::FocusClient: virtual void AddObserver( - aura::client::FocusChangeObserver* observer) OVERRIDE; + aura::client::FocusChangeObserver* observer) override; virtual void RemoveObserver( - aura::client::FocusChangeObserver* observer) OVERRIDE; - virtual void FocusWindow(aura::Window* window) OVERRIDE; - virtual void ResetFocusWithinActiveWindow(aura::Window* window) OVERRIDE; - virtual aura::Window* GetFocusedWindow() OVERRIDE; + aura::client::FocusChangeObserver* observer) override; + virtual void FocusWindow(aura::Window* window) override; + virtual void ResetFocusWithinActiveWindow(aura::Window* window) override; + virtual aura::Window* GetFocusedWindow() override; // Overridden from ui::EventHandler: - virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE; - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; - virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE; - virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE; - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; + virtual void OnKeyEvent(ui::KeyEvent* event) override; + virtual void OnMouseEvent(ui::MouseEvent* event) override; + virtual void OnScrollEvent(ui::ScrollEvent* event) override; + virtual void OnTouchEvent(ui::TouchEvent* event) override; + virtual void OnGestureEvent(ui::GestureEvent* event) override; // Overridden from aura::WindowObserver: virtual void OnWindowVisibilityChanged(aura::Window* window, - bool visible) OVERRIDE; - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; + bool visible) override; + virtual void OnWindowDestroying(aura::Window* window) override; virtual void OnWindowHierarchyChanging( - const HierarchyChangeParams& params) OVERRIDE; + const HierarchyChangeParams& params) override; virtual void OnWindowHierarchyChanged( - const HierarchyChangeParams& params) OVERRIDE; + const HierarchyChangeParams& params) override; // Internal implementation that sets the focused window, fires events etc. // This function must be called with a valid focusable window. diff --git a/ui/wm/core/focus_controller_unittest.cc b/ui/wm/core/focus_controller_unittest.cc index a10cef3..2508bcd 100644 --- a/ui/wm/core/focus_controller_unittest.cc +++ b/ui/wm/core/focus_controller_unittest.cc @@ -56,12 +56,12 @@ class FocusNotificationObserver : public aura::client::ActivationChangeObserver, private: // Overridden from aura::client::ActivationChangeObserver: virtual void OnWindowActivated(aura::Window* gained_active, - aura::Window* lost_active) OVERRIDE { + aura::Window* lost_active) override { ++activation_changed_count_; } virtual void OnAttemptToReactivateWindow( aura::Window* request_active, - aura::Window* actual_active) OVERRIDE { + aura::Window* actual_active) override { ++reactivation_count_; reactivation_requested_window_ = request_active; reactivation_actual_window_ = actual_active; @@ -69,7 +69,7 @@ class FocusNotificationObserver : public aura::client::ActivationChangeObserver, // Overridden from aura::client::FocusChangeObserver: virtual void OnWindowFocused(aura::Window* gained_focus, - aura::Window* lost_focus) OVERRIDE { + aura::Window* lost_focus) override { ++focus_changed_count_; } @@ -116,14 +116,14 @@ class RecordingActivationAndFocusChangeObserver // Overridden from aura::client::ActivationChangeObserver: virtual void OnWindowActivated(aura::Window* gained_active, - aura::Window* lost_active) OVERRIDE { + aura::Window* lost_active) override { if (lost_active && lost_active == deleter_->GetDeletedWindow()) was_notified_with_deleted_window_ = true; } // Overridden from aura::client::FocusChangeObserver: virtual void OnWindowFocused(aura::Window* gained_focus, - aura::Window* lost_focus) OVERRIDE { + aura::Window* lost_focus) override { if (lost_focus && lost_focus == deleter_->GetDeletedWindow()) was_notified_with_deleted_window_ = true; } @@ -159,7 +159,7 @@ class DeleteOnLoseActivationChangeObserver : // Overridden from aura::client::ActivationChangeObserver: virtual void OnWindowActivated(aura::Window* gained_active, - aura::Window* lost_active) OVERRIDE { + aura::Window* lost_active) override { if (window_ && lost_active == window_) { delete lost_active; did_delete_ = true; @@ -167,7 +167,7 @@ class DeleteOnLoseActivationChangeObserver : } // Overridden from WindowDeleter: - virtual aura::Window* GetDeletedWindow() OVERRIDE { + virtual aura::Window* GetDeletedWindow() override { return did_delete_ ? window_ : NULL; } @@ -196,7 +196,7 @@ class DeleteOnLoseFocusChangeObserver // Overridden from aura::client::FocusChangeObserver: virtual void OnWindowFocused(aura::Window* gained_focus, - aura::Window* lost_focus) OVERRIDE { + aura::Window* lost_focus) override { if (window_ && lost_focus == window_) { delete lost_focus; did_delete_ = true; @@ -204,7 +204,7 @@ class DeleteOnLoseFocusChangeObserver } // Overridden from WindowDeleter: - virtual aura::Window* GetDeletedWindow() OVERRIDE { + virtual aura::Window* GetDeletedWindow() override { return did_delete_ ? window_ : NULL; } @@ -267,7 +267,7 @@ class ScopedFocusedTextInputClientChanger private: // Overridden from aura::client::FocusChangeObserver: virtual void OnWindowFocused(aura::Window* gained_focus, - aura::Window* lost_focus) OVERRIDE { + aura::Window* lost_focus) override { ui::TextInputFocusManager::GetInstance()->FocusTextInputClient( text_input_client_); } @@ -282,10 +282,10 @@ class SimpleEventHandler : public ui::EventHandler { virtual ~SimpleEventHandler() {} // Overridden from ui::EventHandler: - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE { + virtual void OnMouseEvent(ui::MouseEvent* event) override { event->SetHandled(); } - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE { + virtual void OnGestureEvent(ui::GestureEvent* event) override { event->SetHandled(); } @@ -308,7 +308,7 @@ class FocusShiftingActivationObserver private: // Overridden from aura::client::ActivationChangeObserver: virtual void OnWindowActivated(aura::Window* gained_active, - aura::Window* lost_active) OVERRIDE { + aura::Window* lost_active) override { // Shift focus to a child. This should prevent the default focusing from // occurring in FocusController::FocusWindow(). if (gained_active == activated_window_) { @@ -338,33 +338,33 @@ class TestFocusRules : public BaseFocusRules { } // Overridden from BaseFocusRules: - virtual bool SupportsChildActivation(aura::Window* window) const OVERRIDE { + virtual bool SupportsChildActivation(aura::Window* window) const override { // In FocusControllerTests, only the RootWindow has activatable children. return window->GetRootWindow() == window; } - virtual bool CanActivateWindow(aura::Window* window) const OVERRIDE { + virtual bool CanActivateWindow(aura::Window* window) const override { // Restricting focus to a non-activatable child window means the activatable // parent outside the focus restriction is activatable. bool can_activate = CanFocusOrActivate(window) || window->Contains(focus_restriction_); return can_activate ? BaseFocusRules::CanActivateWindow(window) : false; } - virtual bool CanFocusWindow(aura::Window* window) const OVERRIDE { + virtual bool CanFocusWindow(aura::Window* window) const override { return CanFocusOrActivate(window) ? BaseFocusRules::CanFocusWindow(window) : false; } virtual aura::Window* GetActivatableWindow( - aura::Window* window) const OVERRIDE { + aura::Window* window) const override { return BaseFocusRules::GetActivatableWindow( CanFocusOrActivate(window) ? window : focus_restriction_); } virtual aura::Window* GetFocusableWindow( - aura::Window* window) const OVERRIDE { + aura::Window* window) const override { return BaseFocusRules::GetFocusableWindow( CanFocusOrActivate(window) ? window : focus_restriction_); } virtual aura::Window* GetNextActivatableWindow( - aura::Window* ignore) const OVERRIDE { + aura::Window* ignore) const override { aura::Window* next_activatable = BaseFocusRules::GetNextActivatableWindow(ignore); return CanFocusOrActivate(next_activatable) ? @@ -387,7 +387,7 @@ class FocusControllerTestBase : public aura::test::AuraTestBase { FocusControllerTestBase() {} // Overridden from aura::test::AuraTestBase: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { wm_state_.reset(new wm::WMState); // FocusController registers itself as an Env observer so it can catch all // window initializations, including the root_window()'s, so we create it @@ -430,7 +430,7 @@ class FocusControllerTestBase : public aura::test::AuraTestBase { aura::test::TestWindowDelegate::CreateSelfDestroyingDelegate(), 3, gfx::Rect(125, 125, 50, 50), root_window()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { root_window()->RemovePreTargetHandler(focus_controller_.get()); aura::test::AuraTestBase::TearDown(); test_focus_rules_ = NULL; // Owned by FocusController. @@ -518,14 +518,14 @@ class FocusControllerDirectTestBase : public FocusControllerTestBase { } // Overridden from FocusControllerTestBase: - virtual void BasicFocus() OVERRIDE { + virtual void BasicFocus() override { EXPECT_EQ(NULL, GetFocusedWindow()); FocusWindowById(1); EXPECT_EQ(1, GetFocusedWindowId()); FocusWindowById(2); EXPECT_EQ(2, GetFocusedWindowId()); } - virtual void BasicActivation() OVERRIDE { + virtual void BasicActivation() override { EXPECT_EQ(NULL, GetActiveWindow()); ActivateWindowById(1); EXPECT_EQ(1, GetActiveWindowId()); @@ -538,7 +538,7 @@ class FocusControllerDirectTestBase : public FocusControllerTestBase { DeactivateWindow(GetActiveWindow()); EXPECT_EQ(1, GetActiveWindowId()); } - virtual void FocusEvents() OVERRIDE { + virtual void FocusEvents() override { ScopedFocusNotificationObserver root_observer(root_window()); ScopedTargetFocusNotificationObserver observer1(root_window(), 1); ScopedTargetFocusNotificationObserver observer2(root_window(), 2); @@ -557,7 +557,7 @@ class FocusControllerDirectTestBase : public FocusControllerTestBase { observer1.ExpectCounts(2, 2); observer2.ExpectCounts(1, 1); } - virtual void DuplicateFocusEvents() OVERRIDE { + virtual void DuplicateFocusEvents() override { // Focusing an existing focused window should not resend focus events. ScopedFocusNotificationObserver root_observer(root_window()); ScopedTargetFocusNotificationObserver observer1(root_window(), 1); @@ -573,7 +573,7 @@ class FocusControllerDirectTestBase : public FocusControllerTestBase { root_observer.ExpectCounts(1, 1); observer1.ExpectCounts(1, 1); } - virtual void ActivationEvents() OVERRIDE { + virtual void ActivationEvents() override { ActivateWindowById(1); ScopedFocusNotificationObserver root_observer(root_window()); @@ -589,7 +589,7 @@ class FocusControllerDirectTestBase : public FocusControllerTestBase { observer1.ExpectCounts(1, 1); observer2.ExpectCounts(1, 1); } - virtual void ReactivationEvents() OVERRIDE { + virtual void ReactivationEvents() override { ActivateWindowById(1); ScopedFocusNotificationObserver root_observer(root_window()); EXPECT_EQ(0, root_observer.reactivation_count()); @@ -603,7 +603,7 @@ class FocusControllerDirectTestBase : public FocusControllerTestBase { EXPECT_EQ(root_window()->GetChildById(1), root_observer.reactivation_actual_window()); } - virtual void DuplicateActivationEvents() OVERRIDE { + virtual void DuplicateActivationEvents() override { // Activating an existing active window should not resend activation events. ActivateWindowById(1); @@ -625,7 +625,7 @@ class FocusControllerDirectTestBase : public FocusControllerTestBase { observer1.ExpectCounts(1, 1); observer2.ExpectCounts(1, 1); } - virtual void ShiftFocusWithinActiveWindow() OVERRIDE { + virtual void ShiftFocusWithinActiveWindow() override { ActivateWindowById(1); EXPECT_EQ(1, GetActiveWindowId()); EXPECT_EQ(1, GetFocusedWindowId()); @@ -634,7 +634,7 @@ class FocusControllerDirectTestBase : public FocusControllerTestBase { FocusWindowById(12); EXPECT_EQ(12, GetFocusedWindowId()); } - virtual void ShiftFocusToChildOfInactiveWindow() OVERRIDE { + virtual void ShiftFocusToChildOfInactiveWindow() override { ActivateWindowById(2); EXPECT_EQ(2, GetActiveWindowId()); EXPECT_EQ(2, GetFocusedWindowId()); @@ -642,7 +642,7 @@ class FocusControllerDirectTestBase : public FocusControllerTestBase { EXPECT_EQ(1, GetActiveWindowId()); EXPECT_EQ(11, GetFocusedWindowId()); } - virtual void ShiftFocusToParentOfFocusedWindow() OVERRIDE { + virtual void ShiftFocusToParentOfFocusedWindow() override { ActivateWindowById(1); EXPECT_EQ(1, GetFocusedWindowId()); FocusWindowById(11); @@ -651,7 +651,7 @@ class FocusControllerDirectTestBase : public FocusControllerTestBase { // Focus should _not_ shift to the parent of the already-focused window. EXPECT_EQ(11, GetFocusedWindowId()); } - virtual void FocusRulesOverride() OVERRIDE { + virtual void FocusRulesOverride() override { EXPECT_EQ(NULL, GetFocusedWindow()); FocusWindowById(11); EXPECT_EQ(11, GetFocusedWindowId()); @@ -667,7 +667,7 @@ class FocusControllerDirectTestBase : public FocusControllerTestBase { FocusWindowById(12); EXPECT_EQ(12, GetFocusedWindowId()); } - virtual void ActivationRulesOverride() OVERRIDE { + virtual void ActivationRulesOverride() override { ActivateWindowById(1); EXPECT_EQ(1, GetActiveWindowId()); EXPECT_EQ(1, GetFocusedWindowId()); @@ -687,7 +687,7 @@ class FocusControllerDirectTestBase : public FocusControllerTestBase { EXPECT_EQ(2, GetActiveWindowId()); EXPECT_EQ(2, GetFocusedWindowId()); } - virtual void ShiftFocusOnActivation() OVERRIDE { + virtual void ShiftFocusOnActivation() override { // When a window is activated, by default that window is also focused. // An ActivationChangeObserver may shift focus to another window within the // same activatable window. @@ -729,7 +729,7 @@ class FocusControllerDirectTestBase : public FocusControllerTestBase { ActivateWindowById(1); EXPECT_EQ(1, GetFocusedWindowId()); } - virtual void ShiftFocusOnActivationDueToHide() OVERRIDE { + virtual void ShiftFocusOnActivationDueToHide() override { // Similar to ShiftFocusOnActivation except the activation change is // triggered by hiding the active window. ActivateWindowById(1); @@ -755,12 +755,12 @@ class FocusControllerDirectTestBase : public FocusControllerTestBase { client->RemoveObserver(observer.get()); } - virtual void NoShiftActiveOnActivation() OVERRIDE { + virtual void NoShiftActiveOnActivation() override { // When a window is activated, we need to prevent any change to activation // from being made in response to an activation change notification. } - virtual void NoFocusChangeOnClickOnCaptureWindow() OVERRIDE { + virtual void NoFocusChangeOnClickOnCaptureWindow() override { scoped_ptr<aura::client::DefaultCaptureClient> capture_client( new aura::client::DefaultCaptureClient(root_window())); // Clicking on a window which has capture should not cause a focus change @@ -781,7 +781,7 @@ class FocusControllerDirectTestBase : public FocusControllerTestBase { } // Verifies focus change is honored while capture held. - virtual void ChangeFocusWhenNothingFocusedAndCaptured() OVERRIDE { + virtual void ChangeFocusWhenNothingFocusedAndCaptured() override { scoped_ptr<aura::client::DefaultCaptureClient> capture_client( new aura::client::DefaultCaptureClient(root_window())); aura::Window* w1 = root_window()->GetChildById(1); @@ -800,7 +800,7 @@ class FocusControllerDirectTestBase : public FocusControllerTestBase { // Verifies if a window that loses activation or focus is deleted during // observer notification we don't pass the deleted window to other observers. - virtual void DontPassDeletedWindow() OVERRIDE { + virtual void DontPassDeletedWindow() override { FocusWindowById(1); EXPECT_EQ(1, GetActiveWindowId()); @@ -839,7 +839,7 @@ class FocusControllerDirectTestBase : public FocusControllerTestBase { // Verifies if the focused text input client is cleared when a window gains // or loses the focus. - virtual void FocusedTextInputClient() OVERRIDE { + virtual void FocusedTextInputClient() override { ui::TextInputFocusManager* text_input_focus_manager = ui::TextInputFocusManager::GetInstance(); ui::DummyTextInputClient text_input_client; @@ -883,16 +883,16 @@ class FocusControllerApiTest : public FocusControllerDirectTestBase { private: // Overridden from FocusControllerTestBase: - virtual void FocusWindowDirect(aura::Window* window) OVERRIDE { + virtual void FocusWindowDirect(aura::Window* window) override { FocusWindow(window); } - virtual void ActivateWindowDirect(aura::Window* window) OVERRIDE { + virtual void ActivateWindowDirect(aura::Window* window) override { ActivateWindow(window); } - virtual void DeactivateWindowDirect(aura::Window* window) OVERRIDE { + virtual void DeactivateWindowDirect(aura::Window* window) override { DeactivateWindow(window); } - virtual bool IsInputEvent() OVERRIDE { return false; } + virtual bool IsInputEvent() override { return false; } DISALLOW_COPY_AND_ASSIGN(FocusControllerApiTest); }; @@ -921,21 +921,21 @@ class FocusControllerMouseEventTest : public FocusControllerDirectTestBase { private: // Overridden from FocusControllerTestBase: - virtual void FocusWindowDirect(aura::Window* window) OVERRIDE { + virtual void FocusWindowDirect(aura::Window* window) override { ui::test::EventGenerator generator(root_window(), window); generator.ClickLeftButton(); } - virtual void ActivateWindowDirect(aura::Window* window) OVERRIDE { + virtual void ActivateWindowDirect(aura::Window* window) override { ui::test::EventGenerator generator(root_window(), window); generator.ClickLeftButton(); } - virtual void DeactivateWindowDirect(aura::Window* window) OVERRIDE { + virtual void DeactivateWindowDirect(aura::Window* window) override { aura::Window* next_activatable = test_focus_rules()->GetNextActivatableWindow(window); ui::test::EventGenerator generator(root_window(), next_activatable); generator.ClickLeftButton(); } - virtual bool IsInputEvent() OVERRIDE { return true; } + virtual bool IsInputEvent() override { return true; } DISALLOW_COPY_AND_ASSIGN(FocusControllerMouseEventTest); }; @@ -946,21 +946,21 @@ class FocusControllerGestureEventTest : public FocusControllerDirectTestBase { private: // Overridden from FocusControllerTestBase: - virtual void FocusWindowDirect(aura::Window* window) OVERRIDE { + virtual void FocusWindowDirect(aura::Window* window) override { ui::test::EventGenerator generator(root_window(), window); generator.GestureTapAt(window->bounds().CenterPoint()); } - virtual void ActivateWindowDirect(aura::Window* window) OVERRIDE { + virtual void ActivateWindowDirect(aura::Window* window) override { ui::test::EventGenerator generator(root_window(), window); generator.GestureTapAt(window->bounds().CenterPoint()); } - virtual void DeactivateWindowDirect(aura::Window* window) OVERRIDE { + virtual void DeactivateWindowDirect(aura::Window* window) override { aura::Window* next_activatable = test_focus_rules()->GetNextActivatableWindow(window); ui::test::EventGenerator generator(root_window(), next_activatable); generator.GestureTapAt(window->bounds().CenterPoint()); } - virtual bool IsInputEvent() OVERRIDE { return true; } + virtual bool IsInputEvent() override { return true; } DISALLOW_COPY_AND_ASSIGN(FocusControllerGestureEventTest); }; @@ -984,7 +984,7 @@ class FocusControllerImplicitTestBase : public FocusControllerTestBase { virtual void PostDispostionChangeExpectations() {} // Overridden from FocusControllerTestBase: - virtual void BasicFocus() OVERRIDE { + virtual void BasicFocus() override { EXPECT_EQ(NULL, GetFocusedWindow()); aura::Window* w211 = root_window()->GetChildById(211); @@ -995,7 +995,7 @@ class FocusControllerImplicitTestBase : public FocusControllerTestBase { // BasicFocusRules passes focus to the parent. EXPECT_EQ(parent_ ? 2 : 21, GetFocusedWindowId()); } - virtual void BasicActivation() OVERRIDE { + virtual void BasicActivation() override { DCHECK(!parent_) << "Activation tests don't support parent changes."; EXPECT_EQ(NULL, GetActiveWindow()); @@ -1008,7 +1008,7 @@ class FocusControllerImplicitTestBase : public FocusControllerTestBase { EXPECT_EQ(3, GetActiveWindowId()); PostDispostionChangeExpectations(); } - virtual void FocusEvents() OVERRIDE { + virtual void FocusEvents() override { aura::Window* w211 = root_window()->GetChildById(211); FocusWindow(w211); @@ -1021,7 +1021,7 @@ class FocusControllerImplicitTestBase : public FocusControllerTestBase { root_observer.ExpectCounts(0, 1); observer211.ExpectCounts(0, 1); } - virtual void ActivationEvents() OVERRIDE { + virtual void ActivationEvents() override { DCHECK(!parent_) << "Activation tests don't support parent changes."; aura::Window* w2 = root_window()->GetChildById(2); @@ -1039,7 +1039,7 @@ class FocusControllerImplicitTestBase : public FocusControllerTestBase { observer2.ExpectCounts(1, 1); observer3.ExpectCounts(1, 1); } - virtual void FocusRulesOverride() OVERRIDE { + virtual void FocusRulesOverride() override { EXPECT_EQ(NULL, GetFocusedWindow()); aura::Window* w211 = root_window()->GetChildById(211); FocusWindow(w211); @@ -1053,7 +1053,7 @@ class FocusControllerImplicitTestBase : public FocusControllerTestBase { test_focus_rules()->set_focus_restriction(NULL); } - virtual void ActivationRulesOverride() OVERRIDE { + virtual void ActivationRulesOverride() override { DCHECK(!parent_) << "Activation tests don't support parent changes."; aura::Window* w1 = root_window()->GetChildById(1); @@ -1096,7 +1096,7 @@ class FocusControllerHideTest : public FocusControllerImplicitTestBase { : FocusControllerImplicitTestBase(parent) {} // Overridden from FocusControllerImplicitTestBase: - virtual void ChangeWindowDisposition(aura::Window* window) OVERRIDE { + virtual void ChangeWindowDisposition(aura::Window* window) override { GetDispositionWindow(window)->Hide(); } @@ -1124,7 +1124,7 @@ class FocusControllerDestructionTest : public FocusControllerImplicitTestBase { : FocusControllerImplicitTestBase(parent) {} // Overridden from FocusControllerImplicitTestBase: - virtual void ChangeWindowDisposition(aura::Window* window) OVERRIDE { + virtual void ChangeWindowDisposition(aura::Window* window) override { delete GetDispositionWindow(window); } @@ -1153,12 +1153,12 @@ class FocusControllerRemovalTest : public FocusControllerImplicitTestBase { : FocusControllerImplicitTestBase(parent) {} // Overridden from FocusControllerImplicitTestBase: - virtual void ChangeWindowDisposition(aura::Window* window) OVERRIDE { + virtual void ChangeWindowDisposition(aura::Window* window) override { aura::Window* disposition_window = GetDispositionWindow(window); disposition_window->parent()->RemoveChild(disposition_window); window_owner_.reset(disposition_window); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { window_owner_.reset(); FocusControllerImplicitTestBase::TearDown(); } diff --git a/ui/wm/core/image_grid.h b/ui/wm/core/image_grid.h index 1242dcb..6102f8b 100644 --- a/ui/wm/core/image_grid.h +++ b/ui/wm/core/image_grid.h @@ -137,11 +137,11 @@ class WM_EXPORT ImageGrid { void SetClipRect(const gfx::Rect& clip_rect, ui::Layer* layer); // ui::LayerDelegate implementation: - virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE; + virtual void OnPaintLayer(gfx::Canvas* canvas) override; virtual void OnDelegatedFrameDamage( - const gfx::Rect& damage_rect_in_dip) OVERRIDE; - virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE; - virtual base::Closure PrepareForLayerBoundsChange() OVERRIDE; + const gfx::Rect& damage_rect_in_dip) override; + virtual void OnDeviceScaleFactorChanged(float device_scale_factor) override; + virtual base::Closure PrepareForLayerBoundsChange() override; private: friend class TestAPI; diff --git a/ui/wm/core/input_method_event_filter.h b/ui/wm/core/input_method_event_filter.h index af82308..d658d77 100644 --- a/ui/wm/core/input_method_event_filter.h +++ b/ui/wm/core/input_method_event_filter.h @@ -35,10 +35,10 @@ class WM_EXPORT InputMethodEventFilter private: // Overridden from ui::EventHandler: - virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE; + virtual void OnKeyEvent(ui::KeyEvent* event) override; // Overridden from ui::internal::InputMethodDelegate: - virtual bool DispatchKeyEventPostIME(const ui::KeyEvent& event) OVERRIDE; + virtual bool DispatchKeyEventPostIME(const ui::KeyEvent& event) override; scoped_ptr<ui::InputMethod> input_method_; diff --git a/ui/wm/core/input_method_event_filter_unittest.cc b/ui/wm/core/input_method_event_filter_unittest.cc index 810ba2a..9a2d31b 100644 --- a/ui/wm/core/input_method_event_filter_unittest.cc +++ b/ui/wm/core/input_method_event_filter_unittest.cc @@ -33,7 +33,7 @@ class TestTextInputClient : public ui::DummyTextInputClient { public: explicit TestTextInputClient(aura::Window* window) : window_(window) {} - virtual aura::Window* GetAttachedWindow() const OVERRIDE { return window_; } + virtual aura::Window* GetAttachedWindow() const override { return window_; } private: aura::Window* window_; @@ -47,7 +47,7 @@ class InputMethodEventFilterTest : public aura::test::AuraTestBase { virtual ~InputMethodEventFilterTest() {} // testing::Test overrides: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { aura::test::AuraTestBase::SetUp(); root_window()->AddPreTargetHandler(&root_filter_); @@ -66,7 +66,7 @@ class InputMethodEventFilterTest : public aura::test::AuraTestBase { test_input_client_.get()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { test_window_.reset(); root_filter_.RemoveHandler(&test_filter_); root_filter_.RemoveHandler(input_method_event_filter_.get()); diff --git a/ui/wm/core/masked_window_targeter.h b/ui/wm/core/masked_window_targeter.h index 61bb3b1e..e289329 100644 --- a/ui/wm/core/masked_window_targeter.h +++ b/ui/wm/core/masked_window_targeter.h @@ -27,7 +27,7 @@ class WM_EXPORT MaskedWindowTargeter : public aura::WindowTargeter { // ui::EventTargeter: virtual bool EventLocationInsideBounds( ui::EventTarget* target, - const ui::LocatedEvent& event) const OVERRIDE; + const ui::LocatedEvent& event) const override; private: aura::Window* masked_window_; diff --git a/ui/wm/core/nested_accelerator_controller.h b/ui/wm/core/nested_accelerator_controller.h index 2826d72e..1eca937 100644 --- a/ui/wm/core/nested_accelerator_controller.h +++ b/ui/wm/core/nested_accelerator_controller.h @@ -29,7 +29,7 @@ class WM_EXPORT NestedAcceleratorController virtual void PrepareNestedLoopClosures( base::MessagePumpDispatcher* dispatcher, base::Closure* run_closure, - base::Closure* quit_closure) OVERRIDE; + base::Closure* quit_closure) override; private: void RunNestedMessageLoop(scoped_ptr<base::RunLoop> run_loop, diff --git a/ui/wm/core/nested_accelerator_controller_unittest.cc b/ui/wm/core/nested_accelerator_controller_unittest.cc index d0a3688..ce548d5 100644 --- a/ui/wm/core/nested_accelerator_controller_unittest.cc +++ b/ui/wm/core/nested_accelerator_controller_unittest.cc @@ -40,10 +40,10 @@ class MockDispatcher : public ui::PlatformEventDispatcher { private: // ui::PlatformEventDispatcher: - virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE { + virtual bool CanDispatchEvent(const ui::PlatformEvent& event) override { return true; } - virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) OVERRIDE { + virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) override { if (ui::EventTypeFromNative(event) == ui::ET_KEY_RELEASED) num_key_events_dispatched_++; return ui::POST_DISPATCH_NONE; @@ -62,11 +62,11 @@ class TestTarget : public ui::AcceleratorTarget { int accelerator_pressed_count() const { return accelerator_pressed_count_; } // Overridden from ui::AcceleratorTarget: - virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE { + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) override { accelerator_pressed_count_++; return true; } - virtual bool CanHandleAccelerators() const OVERRIDE { return true; } + virtual bool CanHandleAccelerators() const override { return true; } private: int accelerator_pressed_count_; @@ -105,7 +105,7 @@ class MockNestedAcceleratorDelegate : public NestedAcceleratorDelegate { // NestedAcceleratorDelegate: virtual Result ProcessAccelerator( - const ui::Accelerator& accelerator) OVERRIDE { + const ui::Accelerator& accelerator) override { return accelerator_manager_->Process(accelerator) ? RESULT_PROCESSED : RESULT_NOT_PROCESSED; } @@ -127,7 +127,7 @@ class NestedAcceleratorTest : public aura::test::AuraTestBase { NestedAcceleratorTest() {} virtual ~NestedAcceleratorTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { AuraTestBase::SetUp(); delegate_ = new MockNestedAcceleratorDelegate(); nested_accelerator_controller_.reset( @@ -136,7 +136,7 @@ class NestedAcceleratorTest : public aura::test::AuraTestBase { nested_accelerator_controller_.get()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { aura::client::SetDispatcherClient(root_window(), NULL); AuraTestBase::TearDown(); delegate_ = NULL; diff --git a/ui/wm/core/nested_accelerator_dispatcher_linux.cc b/ui/wm/core/nested_accelerator_dispatcher_linux.cc index 3379419..ee5b587 100644 --- a/ui/wm/core/nested_accelerator_dispatcher_linux.cc +++ b/ui/wm/core/nested_accelerator_dispatcher_linux.cc @@ -55,16 +55,16 @@ class NestedAcceleratorDispatcherLinux : public NestedAcceleratorDispatcher, private: // AcceleratorDispatcher: - virtual scoped_ptr<base::RunLoop> CreateRunLoop() OVERRIDE { + virtual scoped_ptr<base::RunLoop> CreateRunLoop() override { return scoped_ptr<base::RunLoop>(new base::RunLoop()); } // ui::PlatformEventDispatcher: - virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE { + virtual bool CanDispatchEvent(const ui::PlatformEvent& event) override { return true; } - virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) OVERRIDE { + virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) override { if (IsKeyEvent(event)) { ui::KeyEvent key_event(event); ui::Accelerator accelerator = CreateAcceleratorFromKeyEvent(key_event); diff --git a/ui/wm/core/nested_accelerator_dispatcher_win.cc b/ui/wm/core/nested_accelerator_dispatcher_win.cc index 3b3fb2d..5504d57 100644 --- a/ui/wm/core/nested_accelerator_dispatcher_win.cc +++ b/ui/wm/core/nested_accelerator_dispatcher_win.cc @@ -35,12 +35,12 @@ class NestedAcceleratorDispatcherWin : public NestedAcceleratorDispatcher, private: // NestedAcceleratorDispatcher: - virtual scoped_ptr<base::RunLoop> CreateRunLoop() OVERRIDE { + virtual scoped_ptr<base::RunLoop> CreateRunLoop() override { return scoped_ptr<base::RunLoop>(new base::RunLoop(this)); } // MessagePumpDispatcher: - virtual uint32_t Dispatch(const MSG& event) OVERRIDE { + virtual uint32_t Dispatch(const MSG& event) override { if (IsKeyEvent(event)) { ui::KeyEvent key_event(event); ui::Accelerator accelerator = CreateAcceleratorFromKeyEvent(key_event); diff --git a/ui/wm/core/shadow.h b/ui/wm/core/shadow.h index 5e90650..19f5972 100644 --- a/ui/wm/core/shadow.h +++ b/ui/wm/core/shadow.h @@ -54,7 +54,7 @@ class WM_EXPORT Shadow : public ui::ImplicitAnimationObserver { void SetStyle(Style style); // ui::ImplicitAnimationObserver overrides: - virtual void OnImplicitAnimationsCompleted() OVERRIDE; + virtual void OnImplicitAnimationsCompleted() override; private: // Updates the shadow images to the current |style_|. diff --git a/ui/wm/core/shadow_controller.cc b/ui/wm/core/shadow_controller.cc index 9d1f50e..abd33ad 100644 --- a/ui/wm/core/shadow_controller.cc +++ b/ui/wm/core/shadow_controller.cc @@ -97,16 +97,16 @@ class ShadowController::Impl : static Impl* GetInstance(); // aura::EnvObserver override: - virtual void OnWindowInitialized(aura::Window* window) OVERRIDE; + virtual void OnWindowInitialized(aura::Window* window) override; // aura::WindowObserver overrides: virtual void OnWindowPropertyChanged( - aura::Window* window, const void* key, intptr_t old) OVERRIDE; + aura::Window* window, const void* key, intptr_t old) override; virtual void OnWindowBoundsChanged( aura::Window* window, const gfx::Rect& old_bounds, - const gfx::Rect& new_bounds) OVERRIDE; - virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; + const gfx::Rect& new_bounds) override; + virtual void OnWindowDestroyed(aura::Window* window) override; private: friend class base::RefCounted<Impl>; diff --git a/ui/wm/core/shadow_controller.h b/ui/wm/core/shadow_controller.h index c846894..9deeda6 100644 --- a/ui/wm/core/shadow_controller.h +++ b/ui/wm/core/shadow_controller.h @@ -52,7 +52,7 @@ class WM_EXPORT ShadowController : // aura::client::ActivationChangeObserver overrides: virtual void OnWindowActivated(aura::Window* gained_active, - aura::Window* lost_active) OVERRIDE; + aura::Window* lost_active) override; private: class Impl; diff --git a/ui/wm/core/shadow_controller_unittest.cc b/ui/wm/core/shadow_controller_unittest.cc index 477e3ac..1b1aa18 100644 --- a/ui/wm/core/shadow_controller_unittest.cc +++ b/ui/wm/core/shadow_controller_unittest.cc @@ -27,7 +27,7 @@ class ShadowControllerTest : public aura::test::AuraTestBase { ShadowControllerTest() {} virtual ~ShadowControllerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { wm_state_.reset(new wm::WMState); AuraTestBase::SetUp(); new wm::DefaultActivationClient(root_window()); @@ -35,7 +35,7 @@ class ShadowControllerTest : public aura::test::AuraTestBase { aura::client::GetActivationClient(root_window()); shadow_controller_.reset(new ShadowController(activation_client)); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { shadow_controller_.reset(); AuraTestBase::TearDown(); wm_state_.reset(); diff --git a/ui/wm/core/shadow_unittest.cc b/ui/wm/core/shadow_unittest.cc index 2090b06..2ffdd4a 100644 --- a/ui/wm/core/shadow_unittest.cc +++ b/ui/wm/core/shadow_unittest.cc @@ -40,15 +40,15 @@ class MockResourceBundleDelegate : public ui::ResourceBundle::Delegate { // ResourceBundle::Delegate: virtual base::FilePath GetPathForResourcePack( const base::FilePath& pack_path, - ui::ScaleFactor scale_factor) OVERRIDE { + ui::ScaleFactor scale_factor) override { return base::FilePath(); } virtual base::FilePath GetPathForLocalePack( const base::FilePath& pack_path, - const std::string& locale) OVERRIDE { + const std::string& locale) override { return base::FilePath(); } - virtual gfx::Image GetImageNamed(int resource_id) OVERRIDE { + virtual gfx::Image GetImageNamed(int resource_id) override { last_resource_id_ = resource_id; switch (resource_id) { case IDR_WINDOW_BUBBLE_SHADOW_SMALL: @@ -62,24 +62,24 @@ class MockResourceBundleDelegate : public ui::ResourceBundle::Delegate { } } virtual gfx::Image GetNativeImageNamed( - int resource_id, ui::ResourceBundle::ImageRTL rtl) OVERRIDE { + int resource_id, ui::ResourceBundle::ImageRTL rtl) override { return gfx::Image(); } virtual base::RefCountedStaticMemory* LoadDataResourceBytes( - int resource_id, ui::ScaleFactor scale_factor) OVERRIDE { + int resource_id, ui::ScaleFactor scale_factor) override { return NULL; } virtual bool GetRawDataResource( int resource_id, ui::ScaleFactor scale_factor, - base::StringPiece* value) OVERRIDE { + base::StringPiece* value) override { return false; } virtual bool GetLocalizedString( - int message_id, base::string16* value) OVERRIDE { + int message_id, base::string16* value) override { return false; } virtual scoped_ptr<gfx::Font> GetFont( - ui::ResourceBundle::FontStyle style) OVERRIDE { + ui::ResourceBundle::FontStyle style) override { return scoped_ptr<gfx::Font>(); } @@ -103,7 +103,7 @@ class ShadowTest: public aura::test::AuraTestBase { MockResourceBundleDelegate* delegate() { return delegate_.get(); } // aura::testAuraBase: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { aura::test::AuraTestBase::SetUp(); delegate_.reset(new MockResourceBundleDelegate()); if (ResourceBundle::HasSharedInstance()) @@ -111,7 +111,7 @@ class ShadowTest: public aura::test::AuraTestBase { ui::ResourceBundle::InitSharedInstanceWithLocale( "en-US", delegate(), ui::ResourceBundle::LOAD_COMMON_RESOURCES); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { ui::ResourceBundle::CleanupSharedInstance(); base::FilePath ui_test_pak_path; ASSERT_TRUE(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path)); diff --git a/ui/wm/core/transient_window_controller.h b/ui/wm/core/transient_window_controller.h index 8638824..4322b41 100644 --- a/ui/wm/core/transient_window_controller.h +++ b/ui/wm/core/transient_window_controller.h @@ -20,12 +20,12 @@ class WM_EXPORT TransientWindowController // TransientWindowClient: virtual void AddTransientChild(aura::Window* parent, - aura::Window* child) OVERRIDE; + aura::Window* child) override; virtual void RemoveTransientChild(aura::Window* parent, - aura::Window* child) OVERRIDE; - virtual aura::Window* GetTransientParent(aura::Window* window) OVERRIDE; + aura::Window* child) override; + virtual aura::Window* GetTransientParent(aura::Window* window) override; virtual const aura::Window* GetTransientParent( - const aura::Window* window) OVERRIDE; + const aura::Window* window) override; private: DISALLOW_COPY_AND_ASSIGN(TransientWindowController); diff --git a/ui/wm/core/transient_window_manager.h b/ui/wm/core/transient_window_manager.h index 7a7ee46..a6c5139 100644 --- a/ui/wm/core/transient_window_manager.h +++ b/ui/wm/core/transient_window_manager.h @@ -81,13 +81,13 @@ class WM_EXPORT TransientWindowManager : public aura::WindowObserver { // WindowObserver: virtual void OnWindowParentChanged(aura::Window* window, - aura::Window* parent) OVERRIDE; + aura::Window* parent) override; virtual void OnWindowVisibilityChanging(aura::Window* window, - bool visible) OVERRIDE; + bool visible) override; virtual void OnWindowVisibilityChanged(aura::Window* window, - bool visible) OVERRIDE; - virtual void OnWindowStackingChanged(aura::Window* window) OVERRIDE; - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; + bool visible) override; + virtual void OnWindowStackingChanged(aura::Window* window) override; + virtual void OnWindowDestroying(aura::Window* window) override; aura::Window* window_; aura::Window* transient_parent_; diff --git a/ui/wm/core/transient_window_manager_unittest.cc b/ui/wm/core/transient_window_manager_unittest.cc index eaac027..79d2559 100644 --- a/ui/wm/core/transient_window_manager_unittest.cc +++ b/ui/wm/core/transient_window_manager_unittest.cc @@ -34,11 +34,11 @@ class TestTransientWindowObserver : public TransientWindowObserver { // TransientWindowObserver overrides: virtual void OnTransientChildAdded(Window* window, - Window* transient) OVERRIDE { + Window* transient) override { add_count_++; } virtual void OnTransientChildRemoved(Window* window, - Window* transient) OVERRIDE { + Window* transient) override { remove_count_++; } @@ -54,12 +54,12 @@ class TransientWindowManagerTest : public aura::test::AuraTestBase { TransientWindowManagerTest() {} virtual ~TransientWindowManagerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { AuraTestBase::SetUp(); wm_state_.reset(new wm::WMState); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { wm_state_.reset(); AuraTestBase::TearDown(); } @@ -349,7 +349,7 @@ class DestroyedTrackingDelegate : public aura::test::TestWindowDelegate { : name_(name), results_(results) {} - virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE { + virtual void OnWindowDestroyed(aura::Window* window) override { results_->push_back(name_); } @@ -462,12 +462,12 @@ class StackingMadrigalLayoutManager : public aura::LayoutManager { private: // Overridden from LayoutManager: - virtual void OnWindowResized() OVERRIDE {} - virtual void OnWindowAddedToLayout(Window* child) OVERRIDE {} - virtual void OnWillRemoveWindowFromLayout(Window* child) OVERRIDE {} - virtual void OnWindowRemovedFromLayout(Window* child) OVERRIDE {} + virtual void OnWindowResized() override {} + virtual void OnWindowAddedToLayout(Window* child) override {} + virtual void OnWillRemoveWindowFromLayout(Window* child) override {} + virtual void OnWindowRemovedFromLayout(Window* child) override {} virtual void OnChildWindowVisibilityChanged(Window* child, - bool visible) OVERRIDE { + bool visible) override { Window::Windows::const_iterator it = root_window_->children().begin(); Window* last_window = NULL; for (; it != root_window_->children().end(); ++it) { @@ -482,7 +482,7 @@ class StackingMadrigalLayoutManager : public aura::LayoutManager { } } virtual void SetChildBounds(Window* child, - const gfx::Rect& requested_bounds) OVERRIDE { + const gfx::Rect& requested_bounds) override { SetChildBoundsDirect(child, requested_bounds); } @@ -506,7 +506,7 @@ class StackingMadrigalVisibilityClient : public aura::client::VisibilityClient { private: // Overridden from client::VisibilityClient: - virtual void UpdateLayerVisibility(Window* window, bool visible) OVERRIDE { + virtual void UpdateLayerVisibility(Window* window, bool visible) override { if (!visible) { if (window == ignored_window_) window->layer()->set_delegate(NULL); diff --git a/ui/wm/core/transient_window_stacking_client.h b/ui/wm/core/transient_window_stacking_client.h index 4ab4aea..ce9d55c 100644 --- a/ui/wm/core/transient_window_stacking_client.h +++ b/ui/wm/core/transient_window_stacking_client.h @@ -21,7 +21,7 @@ class WM_EXPORT TransientWindowStackingClient // WindowStackingClient: virtual bool AdjustStacking(aura::Window** child, aura::Window** target, - aura::Window::StackDirection* direction) OVERRIDE; + aura::Window::StackDirection* direction) override; private: // Purely for DCHECKs. diff --git a/ui/wm/core/transient_window_stacking_client_unittest.cc b/ui/wm/core/transient_window_stacking_client_unittest.cc index c5d3bd0..c067496 100644 --- a/ui/wm/core/transient_window_stacking_client_unittest.cc +++ b/ui/wm/core/transient_window_stacking_client_unittest.cc @@ -21,13 +21,13 @@ class TransientWindowStackingClientTest : public aura::test::AuraTestBase { TransientWindowStackingClientTest() {} virtual ~TransientWindowStackingClientTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { AuraTestBase::SetUp(); client_.reset(new TransientWindowStackingClient); aura::client::SetWindowStackingClient(client_.get()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { aura::client::SetWindowStackingClient(NULL); AuraTestBase::TearDown(); } diff --git a/ui/wm/core/user_activity_detector.h b/ui/wm/core/user_activity_detector.h index 851f07a..7e5db9f 100644 --- a/ui/wm/core/user_activity_detector.h +++ b/ui/wm/core/user_activity_detector.h @@ -41,11 +41,11 @@ class WM_EXPORT UserActivityDetector : public ui::EventHandler { void OnDisplayPowerChanging(); // ui::EventHandler implementation. - virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE; - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; - virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE; - virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE; - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; + virtual void OnKeyEvent(ui::KeyEvent* event) override; + virtual void OnMouseEvent(ui::MouseEvent* event) override; + virtual void OnScrollEvent(ui::ScrollEvent* event) override; + virtual void OnTouchEvent(ui::TouchEvent* event) override; + virtual void OnGestureEvent(ui::GestureEvent* event) override; private: // Returns |now_for_test_| if set or base::TimeTicks::Now() otherwise. diff --git a/ui/wm/core/user_activity_detector_unittest.cc b/ui/wm/core/user_activity_detector_unittest.cc index 620ab0c..0273093 100644 --- a/ui/wm/core/user_activity_detector_unittest.cc +++ b/ui/wm/core/user_activity_detector_unittest.cc @@ -26,7 +26,7 @@ class TestUserActivityObserver : public UserActivityObserver { void reset_stats() { num_invocations_ = 0; } // UserActivityObserver implementation. - virtual void OnUserActivity(const ui::Event* event) OVERRIDE { + virtual void OnUserActivity(const ui::Event* event) override { num_invocations_++; } @@ -42,7 +42,7 @@ class UserActivityDetectorTest : public aura::test::AuraTestBase { UserActivityDetectorTest() {} virtual ~UserActivityDetectorTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { AuraTestBase::SetUp(); observer_.reset(new TestUserActivityObserver); detector_.reset(new UserActivityDetector); @@ -52,7 +52,7 @@ class UserActivityDetectorTest : public aura::test::AuraTestBase { detector_->set_now_for_test(now_); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { detector_->RemoveObserver(observer_.get()); AuraTestBase::TearDown(); } diff --git a/ui/wm/core/visibility_controller.h b/ui/wm/core/visibility_controller.h index 47ae991..d29a6da 100644 --- a/ui/wm/core/visibility_controller.h +++ b/ui/wm/core/visibility_controller.h @@ -29,7 +29,7 @@ class WM_EXPORT VisibilityController private: // Overridden from aura::client::VisibilityClient: virtual void UpdateLayerVisibility(aura::Window* window, - bool visible) OVERRIDE; + bool visible) override; DISALLOW_COPY_AND_ASSIGN(VisibilityController); }; diff --git a/ui/wm/core/window_animations.cc b/ui/wm/core/window_animations.cc index 8284990..746ea48 100644 --- a/ui/wm/core/window_animations.cc +++ b/ui/wm/core/window_animations.cc @@ -69,12 +69,12 @@ class HidingWindowAnimationObserverBase : public aura::WindowObserver { } // aura::WindowObserver: - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE { + virtual void OnWindowDestroying(aura::Window* window) override { DCHECK_EQ(window, window_); WindowInvalid(); } - virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE { + virtual void OnWindowDestroyed(aura::Window* window) override { DCHECK_EQ(window, window_); WindowInvalid(); } @@ -168,7 +168,7 @@ class ImplicitHidingWindowAnimationObserver virtual ~ImplicitHidingWindowAnimationObserver() {} // ui::ImplicitAnimationObserver: - virtual void OnImplicitAnimationsCompleted() OVERRIDE; + virtual void OnImplicitAnimationsCompleted() override; private: DISALLOW_COPY_AND_ASSIGN(ImplicitHidingWindowAnimationObserver); @@ -410,15 +410,15 @@ class RotateHidingWindowAnimationObserver // ui::LayerAnimationObserver: virtual void OnLayerAnimationEnded( - ui::LayerAnimationSequence* sequence) OVERRIDE { + ui::LayerAnimationSequence* sequence) override { OnAnimationCompleted(); } virtual void OnLayerAnimationAborted( - ui::LayerAnimationSequence* sequence) OVERRIDE { + ui::LayerAnimationSequence* sequence) override { OnAnimationCompleted(); } virtual void OnLayerAnimationScheduled( - ui::LayerAnimationSequence* sequence) OVERRIDE {} + ui::LayerAnimationSequence* sequence) override {} private: DISALLOW_COPY_AND_ASSIGN(RotateHidingWindowAnimationObserver); diff --git a/ui/wm/core/window_animations_unittest.cc b/ui/wm/core/window_animations_unittest.cc index 0a9a944..b1db736 100644 --- a/ui/wm/core/window_animations_unittest.cc +++ b/ui/wm/core/window_animations_unittest.cc @@ -47,7 +47,7 @@ class WindowAnimationsTest : public aura::test::AuraTestBase { public: WindowAnimationsTest() {} - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { AuraTestBase::TearDown(); } @@ -258,13 +258,13 @@ class NotifyHideCompletedAnimationHost : public aura::client::AnimationHost { virtual ~NotifyHideCompletedAnimationHost() {} // Overridden from TestWindowDelegate: - virtual void OnWindowHidingAnimationCompleted() OVERRIDE { + virtual void OnWindowHidingAnimationCompleted() override { hide_completed_ = true; } virtual void SetHostTransitionOffsets( const gfx::Vector2d& top_left, - const gfx::Vector2d& bottom_right) OVERRIDE {} + const gfx::Vector2d& bottom_right) override {} bool hide_completed() const { return hide_completed_; } diff --git a/ui/wm/core/window_modality_controller.h b/ui/wm/core/window_modality_controller.h index 4d52c21..33386ce 100644 --- a/ui/wm/core/window_modality_controller.h +++ b/ui/wm/core/window_modality_controller.h @@ -38,20 +38,20 @@ class WM_EXPORT WindowModalityController : public ui::EventHandler, virtual ~WindowModalityController(); // Overridden from ui::EventHandler: - virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE; - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; - virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE; + virtual void OnKeyEvent(ui::KeyEvent* event) override; + virtual void OnMouseEvent(ui::MouseEvent* event) override; + virtual void OnTouchEvent(ui::TouchEvent* event) override; // Overridden from aura::EnvObserver: - virtual void OnWindowInitialized(aura::Window* window) OVERRIDE; + virtual void OnWindowInitialized(aura::Window* window) override; // Overridden from aura::WindowObserver: virtual void OnWindowPropertyChanged(aura::Window* window, const void* key, - intptr_t old) OVERRIDE; + intptr_t old) override; virtual void OnWindowVisibilityChanged(aura::Window* window, - bool visible) OVERRIDE; - virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; + bool visible) override; + virtual void OnWindowDestroyed(aura::Window* window) override; private: // Processes a mouse/touch event, and returns true if the event should be diff --git a/ui/wm/public/scoped_tooltip_disabler.h b/ui/wm/public/scoped_tooltip_disabler.h index 0fd3e11..1022788 100644 --- a/ui/wm/public/scoped_tooltip_disabler.h +++ b/ui/wm/public/scoped_tooltip_disabler.h @@ -24,7 +24,7 @@ class AURA_EXPORT ScopedTooltipDisabler : aura::WindowObserver { void EnableTooltips(); // aura::WindowObserver: - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; + virtual void OnWindowDestroying(aura::Window* window) override; // The RootWindow to disable Tooltips on; NULL if the Window passed to the // constructor was not in a root or the root has been destroyed. diff --git a/ui/wm/test/run_all_unittests.cc b/ui/wm/test/run_all_unittests.cc index 6e04469..a0ac59d 100644 --- a/ui/wm/test/run_all_unittests.cc +++ b/ui/wm/test/run_all_unittests.cc @@ -18,7 +18,7 @@ class WMTestSuite : public base::TestSuite { WMTestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {} protected: - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { base::TestSuite::Initialize(); gfx::GLSurface::InitializeOneOffForTests(); ui::RegisterPathProvider(); @@ -28,7 +28,7 @@ class WMTestSuite : public base::TestSuite { ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path); } - virtual void Shutdown() OVERRIDE { + virtual void Shutdown() override { ui::ResourceBundle::CleanupSharedInstance(); base::TestSuite::Shutdown(); } diff --git a/ui/wm/test/wm_test_helper.h b/ui/wm/test/wm_test_helper.h index 79e15ff..990b478 100644 --- a/ui/wm/test/wm_test_helper.h +++ b/ui/wm/test/wm_test_helper.h @@ -47,7 +47,7 @@ class WMTestHelper : public aura::client::WindowTreeClient { // Overridden from client::WindowTreeClient: virtual aura::Window* GetDefaultParent(aura::Window* context, aura::Window* window, - const gfx::Rect& bounds) OVERRIDE; + const gfx::Rect& bounds) override; private: scoped_ptr<aura::WindowTreeHost> host_; |