| Index: chrome/browser/intents/native_services.h
|
| diff --git a/chrome/browser/intents/native_services.h b/chrome/browser/intents/native_services.h
|
| index 12846a163955f43be2468d4623f3960a7bf6ffb4..4a7c4e209c7953c1a60ef12d27bc8dbf32953ac5 100644
|
| --- a/chrome/browser/intents/native_services.h
|
| +++ b/chrome/browser/intents/native_services.h
|
| @@ -12,6 +12,7 @@
|
| class GURL;
|
|
|
| namespace content {
|
| +class WebContents;
|
| class WebIntentsDispatcher;
|
| }
|
|
|
| @@ -29,7 +30,7 @@ extern const char kNativeFilePickerUrl[];
|
|
|
| typedef std::vector<webkit_glue::WebIntentServiceData> IntentServiceList;
|
|
|
| -#if defined(TOOLKIT_VIEWS)
|
| +#if !defined(ANDROID)
|
| // Factory capable of producing a file picker NativeService.
|
| class FilePickerFactory {
|
| public:
|
| @@ -38,7 +39,9 @@ class FilePickerFactory {
|
|
|
| // Returns a new instance of FilePickerService.
|
| static IntentServiceHost* CreateServiceInstance(
|
| - const webkit_glue::WebIntentData& intent);
|
| + const webkit_glue::WebIntentData& intent,
|
| + content::WebContents* web_contents);
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(FilePickerFactory);
|
| };
|
| #endif
|
| @@ -50,17 +53,22 @@ class NativeServiceRegistry {
|
| void GetSupportedServices(
|
| const string16& action,
|
| IntentServiceList* services);
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(NativeServiceRegistry);
|
| };
|
|
|
| class NativeServiceFactory {
|
| public:
|
| NativeServiceFactory();
|
| - // Returns a NativeService instance suitable to handle
|
| - // |intent|.
|
| + // Returns a NativeService instance suitable to handle |intent|.
|
| + // |url| identifies the service to be instantiated, and |web_contents|
|
| + // is the web_contents that may be be needed to serve as host environment
|
| + // to the service.
|
| IntentServiceHost* CreateServiceInstance(
|
| const GURL& url,
|
| - const webkit_glue::WebIntentData& intent);
|
| + const webkit_glue::WebIntentData& intent,
|
| + content::WebContents* web_contents);
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(NativeServiceFactory);
|
| };
|
|
|
|
|