Index: ash/shell/app_list.cc |
diff --git a/ash/shell/app_list.cc b/ash/shell/app_list.cc |
index 1c00f2b66431d1b49e193a43d2a169696efbf707..2f725e2b1bf73adcbfa823440e069b77cc8bdab2 100644 |
--- a/ash/shell/app_list.cc |
+++ b/ash/shell/app_list.cc |
@@ -138,7 +138,7 @@ class WindowTypeShelfItem : public app_list::AppListItem { |
} |
// AppListItem |
- virtual void Activate(int event_flags) OVERRIDE { |
+ virtual void Activate(int event_flags) override { |
ActivateItem(type_, event_flags); |
} |
@@ -235,37 +235,37 @@ class ExampleAppListViewDelegate : public app_list::AppListViewDelegate { |
} |
// Overridden from app_list::AppListViewDelegate: |
- virtual bool ForceNativeDesktop() const OVERRIDE { |
+ virtual bool ForceNativeDesktop() const override { |
return false; |
} |
- virtual void SetProfileByPath(const base::FilePath& profile_path) OVERRIDE { |
+ virtual void SetProfileByPath(const base::FilePath& profile_path) override { |
// Nothing needs to be done. |
} |
- virtual const Users& GetUsers() const OVERRIDE { |
+ virtual const Users& GetUsers() const override { |
return users_; |
} |
- virtual bool ShouldCenterWindow() const OVERRIDE { |
+ virtual bool ShouldCenterWindow() const override { |
return false; |
} |
- virtual app_list::AppListModel* GetModel() OVERRIDE { return model_.get(); } |
+ virtual app_list::AppListModel* GetModel() override { return model_.get(); } |
- virtual app_list::SpeechUIModel* GetSpeechUI() OVERRIDE { |
+ virtual app_list::SpeechUIModel* GetSpeechUI() override { |
return &speech_ui_; |
} |
virtual void GetShortcutPathForApp( |
const std::string& app_id, |
- const base::Callback<void(const base::FilePath&)>& callback) OVERRIDE { |
+ const base::Callback<void(const base::FilePath&)>& callback) override { |
callback.Run(base::FilePath()); |
} |
virtual void OpenSearchResult(app_list::SearchResult* result, |
bool auto_launch, |
- int event_flags) OVERRIDE { |
+ int event_flags) override { |
const ExampleSearchResult* example_result = |
static_cast<const ExampleSearchResult*>(result); |
WindowTypeShelfItem::ActivateItem(example_result->type(), event_flags); |
@@ -273,18 +273,18 @@ class ExampleAppListViewDelegate : public app_list::AppListViewDelegate { |
virtual void InvokeSearchResultAction(app_list::SearchResult* result, |
int action_index, |
- int event_flags) OVERRIDE { |
+ int event_flags) override { |
NOTIMPLEMENTED(); |
} |
- virtual base::TimeDelta GetAutoLaunchTimeout() OVERRIDE { |
+ virtual base::TimeDelta GetAutoLaunchTimeout() override { |
return base::TimeDelta(); |
} |
- virtual void AutoLaunchCanceled() OVERRIDE { |
+ virtual void AutoLaunchCanceled() override { |
} |
- virtual void StartSearch() OVERRIDE { |
+ virtual void StartSearch() override { |
base::string16 query; |
base::TrimWhitespace(model_->search_box()->text(), base::TRIM_ALL, &query); |
query = base::i18n::ToLower(query); |
@@ -306,58 +306,58 @@ class ExampleAppListViewDelegate : public app_list::AppListViewDelegate { |
} |
} |
- virtual void StopSearch() OVERRIDE { |
+ virtual void StopSearch() override { |
// Nothing needs to be done. |
} |
- virtual void ViewInitialized() OVERRIDE { |
+ virtual void ViewInitialized() override { |
// Nothing needs to be done. |
} |
- virtual void Dismiss() OVERRIDE { |
+ virtual void Dismiss() override { |
DCHECK(ash::Shell::HasInstance()); |
Shell::GetInstance()->DismissAppList(); |
} |
- virtual void ViewClosing() OVERRIDE { |
+ virtual void ViewClosing() override { |
// Nothing needs to be done. |
} |
- virtual gfx::ImageSkia GetWindowIcon() OVERRIDE { |
+ virtual gfx::ImageSkia GetWindowIcon() override { |
return gfx::ImageSkia(); |
} |
- virtual void OpenSettings() OVERRIDE { |
+ virtual void OpenSettings() override { |
// Nothing needs to be done. |
} |
- virtual void OpenHelp() OVERRIDE { |
+ virtual void OpenHelp() override { |
// Nothing needs to be done. |
} |
- virtual void OpenFeedback() OVERRIDE { |
+ virtual void OpenFeedback() override { |
// Nothing needs to be done. |
} |
- virtual void ToggleSpeechRecognition() OVERRIDE { |
+ virtual void ToggleSpeechRecognition() override { |
NOTIMPLEMENTED(); |
} |
virtual void ShowForProfileByPath( |
- const base::FilePath& profile_path) OVERRIDE { |
+ const base::FilePath& profile_path) override { |
// Nothing needs to be done. |
} |
- virtual views::View* CreateStartPageWebView(const gfx::Size& size) OVERRIDE { |
+ virtual views::View* CreateStartPageWebView(const gfx::Size& size) override { |
return NULL; |
} |
virtual std::vector<views::View*> CreateCustomPageWebViews( |
- const gfx::Size& size) OVERRIDE { |
+ const gfx::Size& size) override { |
return std::vector<views::View*>(); |
} |
- virtual bool IsSpeechRecognitionEnabled() OVERRIDE { |
+ virtual bool IsSpeechRecognitionEnabled() override { |
return false; |
} |