Index: chrome/browser/chromeos/gdata/gdata_system_service.cc |
diff --git a/chrome/browser/chromeos/gdata/gdata_system_service.cc b/chrome/browser/chromeos/gdata/gdata_system_service.cc |
index d9835a6bfb629dc385556164b27a5b7ba44e15ba..dab9e9ca5f339c844815943c93078da46b83261f 100644 |
--- a/chrome/browser/chromeos/gdata/gdata_system_service.cc |
+++ b/chrome/browser/chromeos/gdata/gdata_system_service.cc |
@@ -7,16 +7,17 @@ |
#include "base/bind.h" |
#include "base/bind_helpers.h" |
#include "chrome/browser/browser_process.h" |
+#include "chrome/browser/chromeos/gdata/drive_api_service.h" |
#include "chrome/browser/chromeos/gdata/drive_webapps_registry.h" |
#include "chrome/browser/chromeos/gdata/file_write_helper.h" |
#include "chrome/browser/chromeos/gdata/gdata_contacts_service.h" |
-#include "chrome/browser/chromeos/gdata/gdata_documents_service.h" |
#include "chrome/browser/chromeos/gdata/gdata_download_observer.h" |
#include "chrome/browser/chromeos/gdata/gdata_file_system.h" |
#include "chrome/browser/chromeos/gdata/gdata_file_system_proxy.h" |
#include "chrome/browser/chromeos/gdata/gdata_sync_client.h" |
#include "chrome/browser/chromeos/gdata/gdata_uploader.h" |
#include "chrome/browser/chromeos/gdata/gdata_util.h" |
+#include "chrome/browser/chromeos/gdata/gdata_wapi_service.h" |
#include "chrome/browser/download/download_service.h" |
#include "chrome/browser/download/download_service_factory.h" |
#include "chrome/browser/profiles/profile.h" |
@@ -211,7 +212,9 @@ ProfileKeyedService* GDataSystemServiceFactory::BuildServiceInstanceFor( |
DocumentsServiceInterface* documents_service = |
g_test_documents_service ? g_test_documents_service : |
- new DocumentsService(); |
+ util::IsDriveV2ApiEnabled() ? |
satorux1
2012/08/17 12:05:48
please don't nest ternary operators. very hard to
kochi
2012/08/20 09:17:30
Done.
|
+ reinterpret_cast<DocumentsServiceInterface*>(new DriveAPIService()) : |
+ reinterpret_cast<DocumentsServiceInterface*>(new GDataWapiService()); |
g_test_documents_service = NULL; |
FilePath cache_root = |