Rename WebIntentData for backend storage to WebIntentServiceData.

chrome/browser/ui/intents/intents_model.cc

 // 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.
 
 #include "chrome/browser/ui/intents/intents_model.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/intents/web_intents_registry.h"
@@ skipping 102 matching lines @@
   }
 }
 
 void IntentsModel::LoadModel() {
   NotifyObserverBeginBatch();
   intents_registry_->GetAllIntentProviders(this);
 }
 
 void IntentsModel::OnIntentsQueryDone(
     WebIntentsRegistry::QueryID query_id,
-    const std::vector<WebIntentData>& intents) {
-  for (size_t i = 0; i < intents.size(); ++i) {
+    const std::vector<WebIntentServiceData>& services) {
+  for (size_t i = 0; i < services.size(); ++i) {
     // Eventually do some awesome sorting, grouping, clustering stuff here.
     // For now, just stick it in the model flat.
     IntentsTreeNode* n = new IntentsTreeNode(ASCIIToUTF16(
-        intents[i].service_url.host()));
+        services[i].service_url.host()));
     ServiceTreeNode* ns = new ServiceTreeNode(ASCIIToUTF16(
-        intents[i].service_url.host()));
-    ns->SetServiceName(intents[i].title);
-    ns->SetServiceUrl(ASCIIToUTF16(intents[i].service_url.spec()));
-    GURL icon_url = intents[i].service_url.GetOrigin().Resolve("/favicon.ico");
+        services[i].service_url.host()));
+    ns->SetServiceName(services[i].title);
+    ns->SetServiceUrl(ASCIIToUTF16(services[i].service_url.spec()));
+    GURL icon_url = services[i].service_url.GetOrigin().Resolve("/favicon.ico");
     ns->SetIconUrl(ASCIIToUTF16(icon_url.spec()));
-    ns->SetAction(intents[i].action);
-    ns->AddType(intents[i].type);
+    ns->SetAction(services[i].action);
+    ns->AddType(services[i].type);
     // Won't generate a notification. OK for now as the next line will.
     n->Add(ns, 0);
     Add(GetRoot(), n, GetRoot()->child_count());
   }
 
   NotifyObserverEndBatch();
 }
 
 void IntentsModel::NotifyObserverBeginBatch() {
   // Only notify the model once if we're batching in a nested manner.
   if (batch_update_++ == 0) {
     FOR_EACH_OBSERVER(Observer,
                       intents_observer_list_,
                       TreeModelBeginBatch(this));
   }
 }
 
 void IntentsModel::NotifyObserverEndBatch() {
   // Only notify the observers if this is the outermost call to EndBatch() if
   // called in a nested manner.
   if (--batch_update_ == 0) {
     FOR_EACH_OBSERVER(Observer,
                       intents_observer_list_,
                       TreeModelEndBatch(this));
   }
 }