summaryrefslogtreecommitdiffstats
path: root/chrome/browser/bookmarks
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-28 20:41:10 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-28 20:41:10 +0000
commitbe952c3ca6d93968409b246c9439a7d8c2a06bba (patch)
tree501d38ada79c1fddf10f65fe6c88b27a3df4cb1d /chrome/browser/bookmarks
parent86c008e8a7da9c00c5a676eb201ba5d0c976748e (diff)
downloadchromium_src-be952c3ca6d93968409b246c9439a7d8c2a06bba.zip
chromium_src-be952c3ca6d93968409b246c9439a7d8c2a06bba.tar.gz
chromium_src-be952c3ca6d93968409b246c9439a7d8c2a06bba.tar.bz2
Fix a ton of compiler warnings.
Most of these are classes with virtual methods lacking virtual destructors or NULL used in non-pointer context. BUG=none TEST=app_unittests && base_unittests --gtest_filter=-ConditionVariableTest.LargeFastTaskTest patch by Jacob Mandelson <jlmjlm [at] gmail> http://codereview.chromium.org/171028/show git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24792 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/bookmarks')
-rw-r--r--chrome/browser/bookmarks/bookmark_model_observer.h5
-rw-r--r--chrome/browser/bookmarks/bookmark_service.h5
2 files changed, 8 insertions, 2 deletions
diff --git a/chrome/browser/bookmarks/bookmark_model_observer.h b/chrome/browser/bookmarks/bookmark_model_observer.h
index 1b85fe3..738fc09 100644
--- a/chrome/browser/bookmarks/bookmark_model_observer.h
+++ b/chrome/browser/bookmarks/bookmark_model_observer.h
@@ -15,7 +15,7 @@ class BookmarkModelObserver {
virtual void Loaded(BookmarkModel* model) = 0;
// Invoked from the destructor of the BookmarkModel.
- virtual void BookmarkModelBeingDeleted(BookmarkModel* model) { }
+ virtual void BookmarkModelBeingDeleted(BookmarkModel* model) {}
// Invoked when a node has moved.
virtual void BookmarkNodeMoved(BookmarkModel* model,
@@ -51,6 +51,9 @@ class BookmarkModelObserver {
// |node| have been reordered in some way, such as sorted.
virtual void BookmarkNodeChildrenReordered(BookmarkModel* model,
const BookmarkNode* node) = 0;
+
+ protected:
+ ~BookmarkModelObserver() {}
};
#endif // CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_OBSERVER_H_
diff --git a/chrome/browser/bookmarks/bookmark_service.h b/chrome/browser/bookmarks/bookmark_service.h
index 2de91cf..1816057 100644
--- a/chrome/browser/bookmarks/bookmark_service.h
+++ b/chrome/browser/bookmarks/bookmark_service.h
@@ -1,4 +1,4 @@
-// Copyright 2008, Google Inc.
+// Copyright 2009, The Chromium Authors
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@ class BookmarkService {
// Blocks until loaded. This is intended for usage on a thread other than
// the main thread.
virtual void BlockTillLoaded() = 0;
+
+ protected:
+ ~BookmarkService() {}
};
#endif // CHROME_BROWSER_BOOKMARKS_BOOKMARK_SERVICE_H_