| Index: chrome/browser/webdata/web_data_service.h
|
| diff --git a/chrome/browser/webdata/web_data_service.h b/chrome/browser/webdata/web_data_service.h
|
| index f40ad0042191cdf55bbed4a0f6afd697284241d1..baa01bbaa2d7a6197697f730f3e4afac10e755ce 100644
|
| --- a/chrome/browser/webdata/web_data_service.h
|
| +++ b/chrome/browser/webdata/web_data_service.h
|
| @@ -31,7 +31,6 @@ class Profile;
|
| class SkBitmap;
|
| class TemplateURL;
|
| class WebDatabase;
|
| -struct WebIntentServiceData;
|
|
|
| namespace base {
|
| class Thread;
|
| @@ -40,6 +39,7 @@ class Thread;
|
| namespace webkit_glue {
|
| struct FormField;
|
| struct PasswordForm;
|
| +struct WebIntentServiceData;
|
| }
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
| @@ -359,10 +359,10 @@ class WebDataService
|
| //////////////////////////////////////////////////////////////////////////////
|
|
|
| // Adds a web intent provider registration.
|
| - void AddWebIntent(const WebIntentServiceData& service);
|
| + void AddWebIntent(const webkit_glue::WebIntentServiceData& service);
|
|
|
| // Removes a web intent provider registration.
|
| - void RemoveWebIntent(const WebIntentServiceData& service);
|
| + void RemoveWebIntent(const webkit_glue::WebIntentServiceData& service);
|
|
|
| // Get all web intent providers registered for the specified |action|.
|
| // |consumer| must not be NULL.
|
| @@ -611,8 +611,10 @@ class WebDataService
|
| // Web Intents.
|
| //
|
| //////////////////////////////////////////////////////////////////////////////
|
| - void AddWebIntentImpl(GenericRequest<WebIntentServiceData>* request);
|
| - void RemoveWebIntentImpl(GenericRequest<WebIntentServiceData>* request);
|
| + void AddWebIntentImpl(
|
| + GenericRequest<webkit_glue::WebIntentServiceData>* request);
|
| + void RemoveWebIntentImpl(
|
| + GenericRequest<webkit_glue::WebIntentServiceData>* request);
|
| void GetWebIntentsImpl(GenericRequest<string16>* request);
|
| void GetAllWebIntentsImpl(GenericRequest<std::string>* request);
|
|
|
|
|