chrome/browser/chromeos/drive/drive_integration_service.cc - Issue 96413002: Move c/b/google_apis to google_apis/drive.

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

Issue 96413002: Move c/b/google_apis to google_apis/drive. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 7 years 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_file_stream_reader_unittest.cc ('k') | chrome/browser/chromeos/drive/drive_url_request_job_unittest.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"

(...skipping 12 matching lines...) Expand all Loading...
23 #include "chrome/browser/chromeos/drive/resource_metadata_storage.h"	23 #include "chrome/browser/chromeos/drive/resource_metadata_storage.h"

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

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

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

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

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

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

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

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

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

33 #include "chrome/browser/google_apis/auth_service.h"

34 #include "chrome/browser/google_apis/gdata_wapi_url_generator.h"

35 #include "chrome/browser/profiles/profile.h"	33 #include "chrome/browser/profiles/profile.h"

36 #include "chrome/browser/signin/profile_oauth2_token_service.h"	34 #include "chrome/browser/signin/profile_oauth2_token_service.h"

37 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"	35 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"

38 #include "chrome/common/chrome_version_info.h"	36 #include "chrome/common/chrome_version_info.h"

39 #include "chrome/common/pref_names.h"	37 #include "chrome/common/pref_names.h"

40 #include "components/browser_context_keyed_service/browser_context_dependency_ma nager.h"	38 #include "components/browser_context_keyed_service/browser_context_dependency_ma nager.h"

41 #include "content/public/browser/browser_context.h"	39 #include "content/public/browser/browser_context.h"

42 #include "content/public/browser/browser_thread.h"	40 #include "content/public/browser/browser_thread.h"

	41 #include "google_apis/drive/auth_service.h"

	42 #include "google_apis/drive/gdata_wapi_url_generator.h"

43 #include "grit/generated_resources.h"	43 #include "grit/generated_resources.h"

44 #include "ui/base/l10n/l10n_util.h"	44 #include "ui/base/l10n/l10n_util.h"

45 #include "webkit/browser/fileapi/external_mount_points.h"	45 #include "webkit/browser/fileapi/external_mount_points.h"

46 #include "webkit/common/user_agent/user_agent_util.h"	46 #include "webkit/common/user_agent/user_agent_util.h"

47	47

48 using content::BrowserContext;	48 using content::BrowserContext;

49 using content::BrowserThread;	49 using content::BrowserThread;

50	50

51 namespace drive {	51 namespace drive {

52 namespace {	52 namespace {

(...skipping 541 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
594 NULL, base::FilePath(), NULL);	594 NULL, base::FilePath(), NULL);

595 } else {	595 } else {

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

597 }	597 }

598	598

599 service->SetEnabled(drive::util::IsDriveEnabledForProfile(profile));	599 service->SetEnabled(drive::util::IsDriveEnabledForProfile(profile));

600 return service;	600 return service;

601 }	601 }

602	602

603 } // namespace drive	603 } // namespace drive

OLD	NEW