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

Side by Side Diff: chrome/browser/chromeos/drive/drive_integration_service.cc

Issue 861133002: Remove WAPI-related code, except the type definition of ResourceEntry. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove more WAPI related code. Created 5 years, 11 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/drive/drive_integration_service.h" 5 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/files/file_util.h" 8 #include "base/files/file_util.h"
9 #include "base/prefs/pref_change_registrar.h" 9 #include "base/prefs/pref_change_registrar.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 28 matching lines...) Expand all
39 #include "chrome/common/pref_names.h" 39 #include "chrome/common/pref_names.h"
40 #include "chrome/grit/generated_resources.h" 40 #include "chrome/grit/generated_resources.h"
41 #include "components/keyed_service/content/browser_context_dependency_manager.h" 41 #include "components/keyed_service/content/browser_context_dependency_manager.h"
42 #include "components/signin/core/browser/profile_oauth2_token_service.h" 42 #include "components/signin/core/browser/profile_oauth2_token_service.h"
43 #include "components/signin/core/browser/signin_manager.h" 43 #include "components/signin/core/browser/signin_manager.h"
44 #include "content/public/browser/browser_context.h" 44 #include "content/public/browser/browser_context.h"
45 #include "content/public/browser/browser_thread.h" 45 #include "content/public/browser/browser_thread.h"
46 #include "content/public/browser/notification_service.h" 46 #include "content/public/browser/notification_service.h"
47 #include "content/public/common/user_agent.h" 47 #include "content/public/common/user_agent.h"
48 #include "google_apis/drive/auth_service.h" 48 #include "google_apis/drive/auth_service.h"
49 #include "google_apis/drive/gdata_wapi_url_generator.h"
50 #include "storage/browser/fileapi/external_mount_points.h" 49 #include "storage/browser/fileapi/external_mount_points.h"
51 #include "ui/base/l10n/l10n_util.h" 50 #include "ui/base/l10n/l10n_util.h"
52 51
53 using content::BrowserContext; 52 using content::BrowserContext;
54 using content::BrowserThread; 53 using content::BrowserThread;
55 54
56 namespace drive { 55 namespace drive {
57 namespace { 56 namespace {
58 57
59 // Name of the directory used to store metadata. 58 // Name of the directory used to store metadata.
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 232
234 if (test_drive_service) { 233 if (test_drive_service) {
235 drive_service_.reset(test_drive_service); 234 drive_service_.reset(test_drive_service);
236 } else { 235 } else {
237 drive_service_.reset(new DriveAPIService( 236 drive_service_.reset(new DriveAPIService(
238 oauth_service, 237 oauth_service,
239 g_browser_process->system_request_context(), 238 g_browser_process->system_request_context(),
240 blocking_task_runner_.get(), 239 blocking_task_runner_.get(),
241 GURL(google_apis::DriveApiUrlGenerator::kBaseUrlForProduction), 240 GURL(google_apis::DriveApiUrlGenerator::kBaseUrlForProduction),
242 GURL(google_apis::DriveApiUrlGenerator::kBaseDownloadUrlForProduction), 241 GURL(google_apis::DriveApiUrlGenerator::kBaseDownloadUrlForProduction),
243 GURL(google_apis::GDataWapiUrlGenerator::kBaseUrlForProduction),
244 GetDriveUserAgent())); 242 GetDriveUserAgent()));
245 } 243 }
246 scheduler_.reset(new JobScheduler( 244 scheduler_.reset(new JobScheduler(
247 profile_->GetPrefs(), 245 profile_->GetPrefs(),
248 logger_.get(), 246 logger_.get(),
249 drive_service_.get(), 247 drive_service_.get(),
250 blocking_task_runner_.get())); 248 blocking_task_runner_.get()));
251 metadata_storage_.reset(new internal::ResourceMetadataStorage( 249 metadata_storage_.reset(new internal::ResourceMetadataStorage(
252 cache_root_directory_.Append(kMetadataDirectory), 250 cache_root_directory_.Append(kMetadataDirectory),
253 blocking_task_runner_.get())); 251 blocking_task_runner_.get()));
(...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after
643 profile, preference_watcher, 641 profile, preference_watcher,
644 NULL, std::string(), base::FilePath(), NULL); 642 NULL, std::string(), base::FilePath(), NULL);
645 } else { 643 } else {
646 service = factory_for_test_->Run(profile); 644 service = factory_for_test_->Run(profile);
647 } 645 }
648 646
649 return service; 647 return service;
650 } 648 }
651 649
652 } // namespace drive 650 } // namespace drive
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698