[Mac] Prevent search engines from disappearing in the preferences list

chrome/browser/cocoa/search_engine_list_model.mm

 // 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.
 
 #import "chrome/browser/cocoa/search_engine_list_model.h"
 
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 
@@ skipping 70 matching lines @@
       [engines addObject:base::SysWideToNSString(modelURLs[i]->short_name())];
   }
 
   [self setSearchEngines:engines.get()];
 }
 
 // The index into |-searchEngines| of the current default search engine.
 - (NSUInteger)defaultIndex {
   if (!model_) return 0;
 
+  NSUInteger index = 0;
   const TemplateURL* defaultSearchProvider = model_->GetDefaultSearchProvider();
   if (defaultSearchProvider) {
     typedef std::vector<const TemplateURL*> TemplateURLs;
     TemplateURLs urls = model_->GetTemplateURLs();
-    TemplateURLs::iterator i =
-        find(urls.begin(), urls.end(), defaultSearchProvider);
-    if (i != urls.end())
-      return static_cast<int>(i - urls.begin());
+    for (std::vector<const TemplateURL*>::iterator it = urls.begin();
+        it != urls.end(); ++it) {

[pink (ping after 24hrs), 2009/11/02 15:46:23]

align with |std| above, not paren.

+      const TemplateURL* url = *it;
+      if (url->id() == defaultSearchProvider->id())
+        return index;
+      if (url->ShowInDefaultList())
+        ++index;
+    }
   }
   return 0;
 }
 
 - (void)setDefaultIndex:(NSUInteger)index {
   if (model_) {
     typedef std::vector<const TemplateURL*> TemplateURLs;
     TemplateURLs urls = model_->GetTemplateURLs();
     DCHECK(index < urls.size());
     model_->SetDefaultSearchProvider(urls[index]);
   }
 }
 
 @end