Adds back the ability to filter cookies by origin in the cookies options view...

chrome/browser/cookies_tree_model.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/cookies_tree_model.h"
 
 #include <algorithm>
 #include <functional>
 #include <vector>
 
@@ skipping 206 matching lines @@
       break;
     case CookieTreeNode::DetailedInfo::TYPE_COOKIE:
       return COOKIE;
       break;
     default:
       return -1;
   }
 }
 
 void CookiesTreeModel::LoadCookies() {
+  LoadCookiesWithFilter(L"");
+}
+
+void CookiesTreeModel::LoadCookiesWithFilter(const std::wstring& filter) {
   // mmargh mmargh mmargh!
 
   // Since we are running on the UI thread don't call GetURLRequestContext().
   net::CookieMonster* cookie_monster =
       profile_->GetRequestContext()->GetCookieStore()->GetCookieMonster();
 
   all_cookies_ = cookie_monster->GetAllCookies();
   CookieTreeRootNode* root = static_cast<CookieTreeRootNode*>(GetRoot());
   for (CookieList::iterator it = all_cookies_.begin();
        it != all_cookies_.end();
        ++it) {
     // Get the origin cookie
-    CookieTreeOriginNode* origin =
-        root->GetOrCreateOriginNode(UTF8ToWide(it->first));
-    CookieTreeCookiesNode* cookies_node = origin->GetOrCreateCookiesNode();
-    CookieTreeCookieNode* new_cookie = new CookieTreeCookieNode(&*it);
-    cookies_node->AddCookieNode(new_cookie);
+    if (!filter.size() ||
+        (UTF8ToWide(it->first).find(filter) != std::wstring::npos)) {
+      CookieTreeOriginNode* origin =
+          root->GetOrCreateOriginNode(UTF8ToWide(it->first));
+      CookieTreeCookiesNode* cookies_node = origin->GetOrCreateCookiesNode();
+      CookieTreeCookieNode* new_cookie = new CookieTreeCookieNode(&*it);
+      cookies_node->AddCookieNode(new_cookie);
+    }
   }
 }
 
 void CookiesTreeModel::DeleteCookie(
     const net::CookieMonster::CookieListPair& cookie) {
   // notify CookieMonster that we should delete this cookie
   // Since we are running on the UI thread don't call GetURLRequestContext().
   net::CookieMonster* monster =
       profile_->GetRequestContext()->GetCookieStore()->GetCookieMonster();
   // We have stored a copy of all the cookies in the model, and our model is
   // never re-calculated. Thus, we just need to delete the nodes from our
   // model, and tell CookieMonster to delete the cookies. We can keep the
   // vector storing the cookies in-tact and not delete from there (that would
   // invalidate our pointers), and the fact that it contains semi out-of-date
   // data is not problematic as we don't re-build the model based on that.
   monster->DeleteCookie(cookie.first, cookie.second, true);
 }
 
 void CookiesTreeModel::DeleteAllCookies() {
   CookieTreeNode* root = GetRoot();
   root->DeleteStoredObjects();
   int num_children = root->GetChildCount();
-  for (int i = num_children - 1; i >= 0; --i) {
+  for (int i = num_children - 1; i >= 0; --i)
     delete Remove(root, i);
-  }
   LoadCookies();
   NotifyObserverTreeNodeChanged(root);
 }
 
 void CookiesTreeModel::DeleteCookieNode(CookieTreeNode* cookie_node) {
   cookie_node->DeleteStoredObjects();
   // find the parent and index
   CookieTreeNode* parent_node = cookie_node->GetParent();
   int cookie_node_index = parent_node->IndexOfChild(cookie_node);
   delete Remove(parent_node, cookie_node_index);
 }
+
+void CookiesTreeModel::UpdateSearchResults(const std::wstring& filter) {
+  CookieTreeNode* root = GetRoot();
+  int num_children = root->GetChildCount();
+  for (int i = num_children - 1; i >= 0; --i)
+    delete Remove(root, i);
+  LoadCookiesWithFilter(filter);
+  NotifyObserverTreeNodeChanged(root);
+}