summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cookies_tree_model.h
diff options
context:
space:
mode:
authorrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-07 20:06:55 +0000
committerrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-07 20:06:55 +0000
commitc062218b21e639e2c3b8a662ae89e4275bea54aa (patch)
tree832fa256bfd4c4278348ce31bceed54626ed91e2 /chrome/browser/cookies_tree_model.h
parentbd257933d07b79603ff995754a19bf697bfb1c7a (diff)
downloadchromium_src-c062218b21e639e2c3b8a662ae89e4275bea54aa.zip
chromium_src-c062218b21e639e2c3b8a662ae89e4275bea54aa.tar.gz
chromium_src-c062218b21e639e2c3b8a662ae89e4275bea54aa.tar.bz2
Fix a warning found by Clang:
chrome/browser/cookies_tree_model.h:497:16: error: 'CookiesTreeModel::AddObserver' hides overloaded virtual function [-Woverloaded-virtual] Same with RemoveObserver(). BUG=72149 TEST=Clang compiles Review URL: http://codereview.chromium.org/6368130 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74021 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cookies_tree_model.h')
-rw-r--r--chrome/browser/cookies_tree_model.h15
1 files changed, 6 insertions, 9 deletions
diff --git a/chrome/browser/cookies_tree_model.h b/chrome/browser/cookies_tree_model.h
index 851f676..206174c 100644
--- a/chrome/browser/cookies_tree_model.h
+++ b/chrome/browser/cookies_tree_model.h
@@ -487,15 +487,12 @@ class CookiesTreeModel : public ui::TreeNodeModel<CookieTreeNode> {
// Filter the origins to only display matched results.
void UpdateSearchResults(const std::wstring& filter);
- // Overload the Add/Remove observer methods so we can notify about
- // CookiesTreeModel-specific things. Note that this is NOT overriding the
- // method by the same name in TreeNodeModel because the argument type is
- // different. Therefore, if this AddObserver(TreeModelObserver*) is called,
- // the observer will NOT be notified about batching. This is also why we
- // maintain a separate list of observers that are specifically Observer*
- // objects.
- virtual void AddObserver(Observer* observer);
- virtual void RemoveObserver(Observer* observer);
+ // Manages CookiesTreeModel::Observers. This will also call
+ // TreeNodeModel::AddObserver so that it gets all the proper notifications.
+ // Note that the converse is not true: simply adding a TreeModelObserver will
+ // not get CookiesTreeModel::Observer notifications.
+ virtual void AddCookiesTreeObserver(Observer* observer);
+ virtual void RemoveCookiesTreeObserver(Observer* observer);
private:
enum CookieIconIndex {