Added Protector, hooked up DSE verification with error bubble.

chrome/browser/search_engines/template_url_service.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_
 #define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_
 #pragma once
 
 #include <map>
 #include <set>
@@ skipping 184 matching lines @@
 
   // Returns the default search provider. If the TemplateURLService hasn't been
   // loaded, the default search provider is pulled from preferences.
   //
   // NOTE: At least in unittest mode, this may return NULL.
   const TemplateURL* GetDefaultSearchProvider();
 
   // Returns true if the default search is managed through group policy.
   bool is_default_search_managed() const { return is_default_search_managed_; }
 
+  // Returns the default search specified in the prepopulated data, if it
+  // exists.  If not, returns first URL in |template_urls_|, or NULL if that's
+  // empty.

[sky, 2011/10/24 17:04:13]

Document ownership of returned pointer.

[whywhat, 2011/10/25 10:30:41]

Done.

+  const TemplateURL* FindNewDefaultSearchProvider();
+
   // Observers used to listen for changes to the model.
   // TemplateURLService does NOT delete the observers when deleted.
   void AddObserver(TemplateURLServiceObserver* observer);
   void RemoveObserver(TemplateURLServiceObserver* observer);
 
   // Loads the keywords. This has no effect if the keywords have already been
   // loaded.
   // Observers are notified when loading completes via the method
   // OnTemplateURLServiceChanged.
   void Load();
@@ skipping 203 matching lines @@
 
   // Invoked when the Google base URL has changed. Updates the mapping for all
   // TemplateURLs that have a replacement term of {google:baseURL} or
   // {google:baseSuggestURL}.
   void GoogleBaseURLChanged();
 
   // Update the default search.  Called at initialization or when a managed
   // preference has changed.
   void UpdateDefaultSearch();
 
-  // Returns the default search specified in the prepopulated data, if it
-  // exists.  If not, returns first URL in |template_urls_|, or NULL if that's
-  // empty.
-  const TemplateURL* FindNewDefaultSearchProvider();
-
   // Set the default search provider even if it is managed. |url| may be null.
   // Caller is responsible for notifying observers.
   void SetDefaultSearchProviderNoNotify(const TemplateURL* url);
 
   // Adds a new TemplateURL to this model. TemplateURLService will own the
   // reference, and delete it when the TemplateURL is removed.
   // Caller is responsible for notifying observers.
   void AddNoNotify(TemplateURL* template_url);
 
   // Removes the keyword from the model. This deletes the supplied TemplateURL.
@@ skipping 127 matching lines @@
   // true, we ignore any local search engine changes, since we triggered them.
   bool processing_syncer_changes_;
 
   // Sync's SyncChange handler. We push all our changes through this.
   SyncChangeProcessor* sync_processor_;
 
   DISALLOW_COPY_AND_ASSIGN(TemplateURLService);
 };
 
 #endif  // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_