Rename WebIntentData for backend storage to WebIntentServiceData.

chrome/browser/ui/browser.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/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 134 matching lines @@
 #include "grit/locale_settings.h"
 #include "grit/theme_resources_standard.h"
 #include "net/base/cookie_monster.h"
 #include "net/base/net_util.h"
 #include "net/base/registry_controlled_domain.h"
 #include "net/url_request/url_request_context.h"
 #include "ui/base/animation/animation.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/point.h"
 #include "webkit/glue/webkit_glue.h"
+#include "webkit/glue/web_intent_data.h"
 #include "webkit/glue/window_open_disposition.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/autofill/autofill_ie_toolbar_import_win.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/ssl/ssl_error_info.h"
 #include "chrome/browser/task_manager/task_manager.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "ui/base/win/shell.h"
@@ skipping 2330 matching lines @@
 
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableWebIntents))
     return;
 
   GURL service_url(href);
   if (!service_url.is_valid()) {
     const GURL& url = tab->GetURL();
     service_url = url.Resolve(href);
   }
 
-  WebIntentData intent;
-  intent.service_url = service_url;
-  intent.action = action;
-  intent.type = type;
-  intent.title = title;
+  WebIntentServiceData service;
+  service.service_url = service_url;
+  service.action = action;
+  service.type = type;
+  service.title = title;
   tcw->infobar_tab_helper()->AddInfoBar(
-      new RegisterIntentHandlerInfoBarDelegate(tab, intent));
+      new RegisterIntentHandlerInfoBarDelegate(tab, service));
 }
 
 // static
 void Browser::FindReplyHelper(TabContents* tab,
                               int request_id,
                               int number_of_matches,
                               const gfx::Rect& selection_rect,
                               int active_match_ordinal,
                               bool final_update) {
   TabContentsWrapper* tcw = TabContentsWrapper::GetCurrentWrapperForContents(
@@ skipping 1307 matching lines @@
 void Browser::RegisterIntentHandler(TabContents* tab,
                                     const string16& action,
                                     const string16& type,
                                     const string16& href,
                                     const string16& title) {
   RegisterIntentHandlerHelper(tab, action, type, href, title);
 }
 
 void Browser::WebIntentDispatch(TabContents* tab,
                                 int routing_id,
-                                const string16& action,
-                                const string16& type,
-                                const string16& data,
+                                const webkit_glue::WebIntentData& intent,
                                 int intent_id) {
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableWebIntents))
     return;
 
   TabContentsWrapper* tcw =
       TabContentsWrapper::GetCurrentWrapperForContents(tab);
 
   tcw->web_intent_picker_controller()->ShowDialog(window()->GetNativeHandle(),
-                                                  action, type);
+                                                  intent.action, intent.type);
 }
 
 void Browser::FindReply(TabContents* tab,
                         int request_id,
                         int number_of_matches,
                         const gfx::Rect& selection_rect,
                         int active_match_ordinal,
                         bool final_update) {
   FindReplyHelper(tab, request_id, number_of_matches, selection_rect,
                   active_match_ordinal, final_update);
@@ skipping 1377 matching lines @@
       profile()->GetOriginalProfile()->GetProfileSyncService();
   if (service->HasSyncSetupCompleted())
     ShowOptionsTab(chrome::kSyncSetupSubPage);
   else
     service->ShowLoginDialog();
 }
 
 void Browser::ToggleSpeechInput() {
   GetSelectedTabContentsWrapper()->render_view_host()->ToggleSpeechInput();
 }