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

Unified Diff: chrome/browser/intents/native_services.cc

Issue 11071005: Add native file picker impl using SelectFileDialog. (Closed) Base URL: http://git.chromium.org/chromium/src.git@filePicker
Patch Set: Don't use "DeleteService" as a method name since Windows munges it at compile time. Created 8 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
« no previous file with comments | « chrome/browser/intents/native_services.h ('k') | chrome/browser/intents/native_services_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/intents/native_services.cc
diff --git a/chrome/browser/intents/native_services.cc b/chrome/browser/intents/native_services.cc
index 7ed96868ad216713e7e338a097ef47d09bd71efe..f475b8efac28ab44ff0cc8ded72b38a3743c4f8c 100644
--- a/chrome/browser/intents/native_services.cc
+++ b/chrome/browser/intents/native_services.cc
@@ -29,7 +29,7 @@ void NativeServiceRegistry::GetSupportedServices(
switches::kWebIntentsNativeServicesEnabled))
return;
-#if defined(TOOLKIT_VIEWS)
+#if !defined(ANDROID)
if (EqualsASCII(action, web_intents::kActionPick)) {
// File picker registrations.
webkit_glue::WebIntentServiceData service(
@@ -49,11 +49,12 @@ NativeServiceFactory::NativeServiceFactory() {}
IntentServiceHost* NativeServiceFactory::CreateServiceInstance(
const GURL& service_url,
- const webkit_glue::WebIntentData& intent) {
+ const webkit_glue::WebIntentData& intent,
+ content::WebContents* web_contents) {
-#if defined(TOOLKIT_VIEWS)
+#if !defined(ANDROID)
if (service_url.spec() == kNativeFilePickerUrl) {
- return FilePickerFactory::CreateServiceInstance(intent);
+ return FilePickerFactory::CreateServiceInstance(intent, web_contents);
}
#endif
« no previous file with comments | « chrome/browser/intents/native_services.h ('k') | chrome/browser/intents/native_services_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698