Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(20)

Unified Diff: chrome/browser/webdata/web_data_service.h

Issue 8417043: Add webkit_glue namespace. Improve some variable and test names. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge error Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 de709d5c49157b540724cf28c6dc0614ca84be95..d2df94a9b4ec11da08d7e2b1153d96afc3696f79 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;
}
////////////////////////////////////////////////////////////////////////////////
@@ -364,10 +364,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.
@@ -616,8 +616,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);
« no previous file with comments | « chrome/browser/ui/webui/options/web_intents_settings_handler.cc ('k') | chrome/browser/webdata/web_data_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698