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

Unified Diff: athena/home/app_list_view_delegate.h

Issue 623103002: replace OVERRIDE and FINAL with override and final in athena/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « athena/extensions/test/test_extensions_delegate.cc ('k') | athena/home/athena_start_page_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/home/app_list_view_delegate.h
diff --git a/athena/home/app_list_view_delegate.h b/athena/home/app_list_view_delegate.h
index 7ea9240de3c3e53557b46ccb1b6937ac32934a8e..8bf25d59d81a2e9640a4b5fddeba16ad0e33fd62 100644
--- a/athena/home/app_list_view_delegate.h
+++ b/athena/home/app_list_view_delegate.h
@@ -27,39 +27,39 @@ class AppListViewDelegate : public app_list::AppListViewDelegate {
void SearchResultChanged();
// Overridden from app_list::AppListViewDelegate:
- virtual bool ForceNativeDesktop() const OVERRIDE;
- virtual void SetProfileByPath(const base::FilePath& profile_path) OVERRIDE;
- virtual app_list::AppListModel* GetModel() OVERRIDE;
- virtual app_list::SpeechUIModel* GetSpeechUI() OVERRIDE;
+ virtual bool ForceNativeDesktop() const override;
+ virtual void SetProfileByPath(const base::FilePath& profile_path) override;
+ virtual app_list::AppListModel* GetModel() override;
+ virtual app_list::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(app_list::SearchResult* result,
bool auto_launch,
- int event_flags) OVERRIDE;
+ int event_flags) override;
virtual void InvokeSearchResultAction(app_list::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;
- virtual views::View* CreateStartPageWebView(const gfx::Size& size) OVERRIDE;
+ const base::FilePath& profile_path) override;
+ virtual views::View* CreateStartPageWebView(const gfx::Size& size) override;
virtual std::vector<views::View*> CreateCustomPageWebViews(
- const gfx::Size& size) OVERRIDE;
- virtual bool IsSpeechRecognitionEnabled() OVERRIDE;
- virtual const Users& GetUsers() const OVERRIDE;
- virtual bool ShouldCenterWindow() const OVERRIDE;
+ const gfx::Size& size) override;
+ virtual bool IsSpeechRecognitionEnabled() override;
+ virtual const Users& GetUsers() const override;
+ virtual bool ShouldCenterWindow() const override;
scoped_ptr<app_list::AppListModel> model_;
scoped_ptr<app_list::SpeechUIModel> speech_ui_;
« no previous file with comments | « athena/extensions/test/test_extensions_delegate.cc ('k') | athena/home/athena_start_page_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698