chrome/browser/chromeos/drive/drive_integration_service.cc - Issue 130753002: Move DriveAppRegistry from c/b/chromeos/drive to c/b/drive.

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

Issue 130753002: Move DriveAppRegistry from c/b/chromeos/drive to c/b/drive. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix Created 6 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/chromeos/drive/drive_app_registry_unittest.cc ('k') | chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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/file_util.h"	8 #include "base/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"

11 #include "base/strings/stringprintf.h"	11 #include "base/strings/stringprintf.h"

12 #include "base/threading/sequenced_worker_pool.h"	12 #include "base/threading/sequenced_worker_pool.h"

13 #include "chrome/browser/browser_process.h"	13 #include "chrome/browser/browser_process.h"

14 #include "chrome/browser/chromeos/drive/debug_info_collector.h"	14 #include "chrome/browser/chromeos/drive/debug_info_collector.h"

15 #include "chrome/browser/chromeos/drive/download_handler.h"	15 #include "chrome/browser/chromeos/drive/download_handler.h"

16 #include "chrome/browser/chromeos/drive/drive_app_registry.h"

17 #include "chrome/browser/chromeos/drive/file_cache.h"	16 #include "chrome/browser/chromeos/drive/file_cache.h"

18 #include "chrome/browser/chromeos/drive/file_system.h"	17 #include "chrome/browser/chromeos/drive/file_system.h"

19 #include "chrome/browser/chromeos/drive/file_system_util.h"	18 #include "chrome/browser/chromeos/drive/file_system_util.h"

20 #include "chrome/browser/chromeos/drive/job_scheduler.h"	19 #include "chrome/browser/chromeos/drive/job_scheduler.h"

21 #include "chrome/browser/chromeos/drive/logging.h"	20 #include "chrome/browser/chromeos/drive/logging.h"

22 #include "chrome/browser/chromeos/drive/resource_metadata.h"	21 #include "chrome/browser/chromeos/drive/resource_metadata.h"

23 #include "chrome/browser/chromeos/drive/resource_metadata_storage.h"	22 #include "chrome/browser/chromeos/drive/resource_metadata_storage.h"

24 #include "chrome/browser/chromeos/file_manager/path_util.h"	23 #include "chrome/browser/chromeos/file_manager/path_util.h"

25 #include "chrome/browser/chromeos/profiles/profile_util.h"	24 #include "chrome/browser/chromeos/profiles/profile_util.h"

26 #include "chrome/browser/download/download_prefs.h"	25 #include "chrome/browser/download/download_prefs.h"

27 #include "chrome/browser/download/download_service.h"	26 #include "chrome/browser/download/download_service.h"

28 #include "chrome/browser/download/download_service_factory.h"	27 #include "chrome/browser/download/download_service_factory.h"

29 #include "chrome/browser/drive/drive_api_service.h"	28 #include "chrome/browser/drive/drive_api_service.h"

30 #include "chrome/browser/drive/drive_api_util.h"	29 #include "chrome/browser/drive/drive_api_util.h"

	30 #include "chrome/browser/drive/drive_app_registry.h"

31 #include "chrome/browser/drive/drive_notification_manager.h"	31 #include "chrome/browser/drive/drive_notification_manager.h"

32 #include "chrome/browser/drive/drive_notification_manager_factory.h"	32 #include "chrome/browser/drive/drive_notification_manager_factory.h"

33 #include "chrome/browser/drive/gdata_wapi_service.h"	33 #include "chrome/browser/drive/gdata_wapi_service.h"

34 #include "chrome/browser/profiles/profile.h"	34 #include "chrome/browser/profiles/profile.h"

35 #include "chrome/browser/signin/profile_oauth2_token_service.h"	35 #include "chrome/browser/signin/profile_oauth2_token_service.h"

36 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"	36 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"

37 #include "chrome/common/chrome_version_info.h"	37 #include "chrome/common/chrome_version_info.h"

38 #include "chrome/common/pref_names.h"	38 #include "chrome/common/pref_names.h"

39 #include "components/browser_context_keyed_service/browser_context_dependency_ma nager.h"	39 #include "components/browser_context_keyed_service/browser_context_dependency_ma nager.h"

40 #include "content/public/browser/browser_context.h"	40 #include "content/public/browser/browser_context.h"

(...skipping 567 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
608 service = new DriveIntegrationService(profile, preference_watcher,	608 service = new DriveIntegrationService(profile, preference_watcher,

609 NULL, base::FilePath(), NULL);	609 NULL, base::FilePath(), NULL);

610 } else {	610 } else {

611 service = factory_for_test_.Run(profile);	611 service = factory_for_test_.Run(profile);

612 }	612 }

613	613

614 return service;	614 return service;

615 }	615 }

616	616

617 } // namespace drive	617 } // namespace drive

OLD	NEW