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

5 files changed, 11 insertions, 14 deletions

diff --git a/chrome/browser/cookies_tree_model.cc b/chrome/browser/cookies_tree_model.cc
index 5395bcd..4f07e10 100644
--- a/chrome/browser/cookies_tree_model.cc
+++ b/chrome/browser/cookies_tree_model.cc
@@ -660,13 +660,13 @@ void CookiesTreeModel::UpdateSearchResults(const std::wstring& filter) {
   NotifyObserverEndBatch();
 }
 
-void CookiesTreeModel::AddObserver(Observer* observer) {
+void CookiesTreeModel::AddCookiesTreeObserver(Observer* observer) {
   cookies_observer_list_.AddObserver(observer);
   // Call super so that TreeNodeModel can notify, too.
   ui::TreeNodeModel<CookieTreeNode>::AddObserver(observer);
 }
 
-void CookiesTreeModel::RemoveObserver(Observer* observer) {
+void CookiesTreeModel::RemoveCookiesTreeObserver(Observer* observer) {
   cookies_observer_list_.RemoveObserver(observer);
   // Call super so that TreeNodeModel doesn't have dead pointers.
   ui::TreeNodeModel<CookieTreeNode>::RemoveObserver(observer);
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 {
diff --git a/chrome/browser/dom_ui/options/cookies_view_handler.cc b/chrome/browser/dom_ui/options/cookies_view_handler.cc
index e038528..5760184 100644
--- a/chrome/browser/dom_ui/options/cookies_view_handler.cc
+++ b/chrome/browser/dom_ui/options/cookies_view_handler.cc
@@ -343,7 +343,7 @@ void CookiesViewHandler::UpdateSearchResults(const ListValue* args) {
         NULL,
         new BrowsingDataAppCacheHelper(profile),
         BrowsingDataIndexedDBHelper::Create(profile)));
-    cookies_tree_model_->AddObserver(this);
+    cookies_tree_model_->AddCookiesTreeObserver(this);
   }
 
   cookies_tree_model_->UpdateSearchResults(UTF8ToWide(query));
diff --git a/chrome/browser/ui/cocoa/options/cookies_window_controller.mm b/chrome/browser/ui/cocoa/options/cookies_window_controller.mm
index 7c9c812..b6a1a92 100644
--- a/chrome/browser/ui/cocoa/options/cookies_window_controller.mm
+++ b/chrome/browser/ui/cocoa/options/cookies_window_controller.mm
@@ -422,7 +422,7 @@ bool CookiesTreeModelObserverBridge::HasCocoaModel() {
       appcacheHelper_,
       indexedDBHelper_));
   modelObserver_.reset(new CookiesTreeModelObserverBridge(self));
-  treeModel_->AddObserver(modelObserver_.get());
+  treeModel_->AddCookiesTreeObserver(modelObserver_.get());
 
   // Convert the model's icons from Skia to Cocoa.
   std::vector<SkBitmap> skiaIcons;
diff --git a/chrome/browser/ui/views/options/cookies_view.cc b/chrome/browser/ui/views/options/cookies_view.cc
index 8f33083..4082232 100644
--- a/chrome/browser/ui/views/options/cookies_view.cc
+++ b/chrome/browser/ui/views/options/cookies_view.cc
@@ -295,7 +295,7 @@ void CookiesView::Init() {
       NULL,
       new BrowsingDataAppCacheHelper(profile_),
       BrowsingDataIndexedDBHelper::Create(profile_)));
-  cookies_tree_model_->AddObserver(this);
+  cookies_tree_model_->AddCookiesTreeObserver(this);
 
   info_panel_ = new InfoPanelView;
   cookie_info_view_ = new CookieInfoView(false);