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

Unified Diff: chrome/utility/media_galleries/iphoto_library_parser.cc

Issue 653773004: Standardize usage of virtual/override/final in chrome/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
Index: chrome/utility/media_galleries/iphoto_library_parser.cc
diff --git a/chrome/utility/media_galleries/iphoto_library_parser.cc b/chrome/utility/media_galleries/iphoto_library_parser.cc
index 96a2c6d0a247c6f99c1072d677431e5729322351..ba98d8e0c9600f7eb8d5a7d733a7871885961280 100644
--- a/chrome/utility/media_galleries/iphoto_library_parser.cc
+++ b/chrome/utility/media_galleries/iphoto_library_parser.cc
@@ -34,7 +34,7 @@ class PhotosXmlDictReader : public iapps::XmlDictReader {
PhotosXmlDictReader(XmlReader* reader, PhotoInfo* photo_info)
: iapps::XmlDictReader(reader), photo_info_(photo_info) {}
- virtual bool HandleKeyImpl(const std::string& key) override {
+ bool HandleKeyImpl(const std::string& key) override {
if (key == "ImagePath") {
std::string value;
if (!iapps::ReadString(reader_, &value))
@@ -51,9 +51,7 @@ class PhotosXmlDictReader : public iapps::XmlDictReader {
return true;
}
- virtual bool FinishedOk() override {
- return Found("ImagePath");
- }
+ bool FinishedOk() override { return Found("ImagePath"); }
private:
PhotoInfo* photo_info_;
@@ -95,11 +93,11 @@ class AlbumXmlDictReader : public iapps::XmlDictReader {
AlbumXmlDictReader(XmlReader* reader, AlbumInfo* album_info)
: iapps::XmlDictReader(reader), album_info_(album_info) {}
- virtual bool ShouldLoop() override {
+ bool ShouldLoop() override {
return !(Found("AlbumId") && Found("AlbumName") && Found("KeyList"));
}
- virtual bool HandleKeyImpl(const std::string& key) override {
+ bool HandleKeyImpl(const std::string& key) override {
if (key == "AlbumId") {
if (!iapps::ReadInteger(reader_, &album_info_->id))
return false;
@@ -117,9 +115,7 @@ class AlbumXmlDictReader : public iapps::XmlDictReader {
return true;
}
- virtual bool FinishedOk() override {
- return !ShouldLoop();
- }
+ bool FinishedOk() override { return !ShouldLoop(); }
private:
AlbumInfo* album_info_;
@@ -198,11 +194,11 @@ class IPhotoLibraryXmlDictReader : public iapps::XmlDictReader {
IPhotoLibraryXmlDictReader(XmlReader* reader, parser::Library* library)
: iapps::XmlDictReader(reader), library_(library), ok_(true) {}
- virtual bool ShouldLoop() override {
+ bool ShouldLoop() override {
return !(Found("List of Albums") && Found("Master Image List"));
}
- virtual bool HandleKeyImpl(const std::string& key) override {
+ bool HandleKeyImpl(const std::string& key) override {
if (key == "List of Albums") {
if (!iapps::SeekToNodeAtCurrentDepth(reader_, "array") ||
!reader_->Read()) {
@@ -231,15 +227,11 @@ class IPhotoLibraryXmlDictReader : public iapps::XmlDictReader {
return true;
}
- virtual bool FinishedOk() override {
- return ok_;
- }
+ bool FinishedOk() override { return ok_; }
// The IPhotoLibrary allows duplicate "List of Albums" and
// "Master Image List" keys (although that seems odd.)
- virtual bool AllowRepeats() override {
- return true;
- }
+ bool AllowRepeats() override { return true; }
private:
parser::Library* library_;
« no previous file with comments | « chrome/utility/media_galleries/ipc_data_source.h ('k') | chrome/utility/media_galleries/itunes_library_parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698