OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/apps/drive/drive_service_bridge.h" | 5 #include "chrome/browser/apps/drive/drive_service_bridge.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "base/macros.h" | 11 #include "base/macros.h" |
12 #include "base/threading/sequenced_worker_pool.h" | 12 #include "base/threading/sequenced_worker_pool.h" |
13 #include "chrome/browser/drive/drive_notification_manager_factory.h" | 13 #include "chrome/browser/drive/drive_notification_manager_factory.h" |
14 #include "chrome/browser/profiles/profile.h" | 14 #include "chrome/browser/profiles/profile.h" |
15 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" | 15 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" |
16 #include "chrome/browser/signin/signin_manager_factory.h" | 16 #include "chrome/browser/signin/signin_manager_factory.h" |
17 #include "components/drive/drive_app_registry.h" | 17 #include "components/drive/drive_app_registry.h" |
18 #include "components/drive/drive_notification_manager.h" | 18 #include "components/drive/drive_notification_manager.h" |
19 #include "components/drive/drive_notification_observer.h" | 19 #include "components/drive/drive_notification_observer.h" |
20 #include "components/drive/service/drive_api_service.h" | 20 #include "components/drive/service/drive_api_service.h" |
21 #include "components/signin/core/browser/profile_oauth2_token_service.h" | 21 #include "components/signin/core/browser/profile_oauth2_token_service.h" |
22 #include "components/signin/core/browser/signin_manager.h" | 22 #include "components/signin/core/browser/signin_manager.h" |
23 #include "content/public/browser/browser_thread.h" | 23 #include "content/public/browser/browser_thread.h" |
| 24 #include "net/traffic_annotation/network_traffic_annotation.h" |
24 | 25 |
25 namespace { | 26 namespace { |
26 | 27 |
27 // Hosts DriveAPIService and DriveAppRegistry. | 28 // Hosts DriveAPIService and DriveAppRegistry. |
28 // TODO(xiyuan): Optimize to leverage chromeos::DriveIntegrationService. | 29 // TODO(xiyuan): Optimize to leverage chromeos::DriveIntegrationService. |
29 class DriveServiceBridgeImpl : public DriveServiceBridge, | 30 class DriveServiceBridgeImpl : public DriveServiceBridge, |
30 public drive::DriveServiceObserver, | 31 public drive::DriveServiceObserver, |
31 public drive::DriveNotificationObserver { | 32 public drive::DriveNotificationObserver { |
32 public: | 33 public: |
33 explicit DriveServiceBridgeImpl(Profile* profile); | 34 explicit DriveServiceBridgeImpl(Profile* profile); |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
74 scoped_refptr<base::SequencedWorkerPool> worker_pool( | 75 scoped_refptr<base::SequencedWorkerPool> worker_pool( |
75 content::BrowserThread::GetBlockingPool()); | 76 content::BrowserThread::GetBlockingPool()); |
76 scoped_refptr<base::SequencedTaskRunner> drive_task_runner( | 77 scoped_refptr<base::SequencedTaskRunner> drive_task_runner( |
77 worker_pool->GetSequencedTaskRunnerWithShutdownBehavior( | 78 worker_pool->GetSequencedTaskRunnerWithShutdownBehavior( |
78 worker_pool->GetSequenceToken(), | 79 worker_pool->GetSequenceToken(), |
79 base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)); | 80 base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)); |
80 | 81 |
81 ProfileOAuth2TokenService* token_service = | 82 ProfileOAuth2TokenService* token_service = |
82 ProfileOAuth2TokenServiceFactory::GetForProfile(profile_); | 83 ProfileOAuth2TokenServiceFactory::GetForProfile(profile_); |
83 drive_service_.reset(new drive::DriveAPIService( | 84 drive_service_.reset(new drive::DriveAPIService( |
84 token_service, | 85 token_service, profile_->GetRequestContext(), drive_task_runner.get(), |
85 profile_->GetRequestContext(), | |
86 drive_task_runner.get(), | |
87 GURL(google_apis::DriveApiUrlGenerator::kBaseUrlForProduction), | 86 GURL(google_apis::DriveApiUrlGenerator::kBaseUrlForProduction), |
88 GURL(google_apis::DriveApiUrlGenerator::kBaseThumbnailUrlForProduction), | 87 GURL(google_apis::DriveApiUrlGenerator::kBaseThumbnailUrlForProduction), |
89 std::string() /* custom_user_agent */)); | 88 std::string(), /* custom_user_agent */ |
| 89 NO_TRAFFIC_ANNOTATION_YET)); |
90 SigninManagerBase* signin_manager = | 90 SigninManagerBase* signin_manager = |
91 SigninManagerFactory::GetForProfile(profile_); | 91 SigninManagerFactory::GetForProfile(profile_); |
92 drive_service_->Initialize(signin_manager->GetAuthenticatedAccountId()); | 92 drive_service_->Initialize(signin_manager->GetAuthenticatedAccountId()); |
93 drive_service_->AddObserver(this); | 93 drive_service_->AddObserver(this); |
94 | 94 |
95 drive::DriveNotificationManager* drive_notification_manager = | 95 drive::DriveNotificationManager* drive_notification_manager = |
96 drive::DriveNotificationManagerFactory::GetForBrowserContext(profile_); | 96 drive::DriveNotificationManagerFactory::GetForBrowserContext(profile_); |
97 if (drive_notification_manager) | 97 if (drive_notification_manager) |
98 drive_notification_manager->AddObserver(this); | 98 drive_notification_manager->AddObserver(this); |
99 | 99 |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
132 } | 132 } |
133 | 133 |
134 // static | 134 // static |
135 void DriveServiceBridge::AppendDependsOnFactories( | 135 void DriveServiceBridge::AppendDependsOnFactories( |
136 std::set<BrowserContextKeyedServiceFactory*>* factories) { | 136 std::set<BrowserContextKeyedServiceFactory*>* factories) { |
137 DCHECK(factories); | 137 DCHECK(factories); |
138 factories->insert(ProfileOAuth2TokenServiceFactory::GetInstance()); | 138 factories->insert(ProfileOAuth2TokenServiceFactory::GetInstance()); |
139 factories->insert(SigninManagerFactory::GetInstance()); | 139 factories->insert(SigninManagerFactory::GetInstance()); |
140 factories->insert(drive::DriveNotificationManagerFactory::GetInstance()); | 140 factories->insert(drive::DriveNotificationManagerFactory::GetInstance()); |
141 } | 141 } |
OLD | NEW |