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 | 9 |
9 #include "base/logging.h" | 10 #include "base/logging.h" |
10 #include "base/macros.h" | 11 #include "base/macros.h" |
11 #include "chrome/browser/drive/drive_notification_manager_factory.h" | 12 #include "chrome/browser/drive/drive_notification_manager_factory.h" |
12 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" |
13 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" | 14 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" |
14 #include "chrome/browser/signin/signin_manager_factory.h" | 15 #include "chrome/browser/signin/signin_manager_factory.h" |
15 #include "components/drive/drive_app_registry.h" | 16 #include "components/drive/drive_app_registry.h" |
16 #include "components/drive/drive_notification_manager.h" | 17 #include "components/drive/drive_notification_manager.h" |
17 #include "components/drive/drive_notification_observer.h" | 18 #include "components/drive/drive_notification_observer.h" |
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
119 drive_app_registry_->Update(); | 120 drive_app_registry_->Update(); |
120 } | 121 } |
121 | 122 |
122 } // namespace | 123 } // namespace |
123 | 124 |
124 // static | 125 // static |
125 scoped_ptr<DriveServiceBridge> DriveServiceBridge::Create(Profile* profile) { | 126 scoped_ptr<DriveServiceBridge> DriveServiceBridge::Create(Profile* profile) { |
126 scoped_ptr<DriveServiceBridgeImpl> bridge( | 127 scoped_ptr<DriveServiceBridgeImpl> bridge( |
127 new DriveServiceBridgeImpl(profile)); | 128 new DriveServiceBridgeImpl(profile)); |
128 bridge->Initialize(); | 129 bridge->Initialize(); |
129 return bridge.Pass(); | 130 return std::move(bridge); |
130 } | 131 } |
131 | 132 |
132 // static | 133 // static |
133 void DriveServiceBridge::AppendDependsOnFactories( | 134 void DriveServiceBridge::AppendDependsOnFactories( |
134 std::set<BrowserContextKeyedServiceFactory*>* factories) { | 135 std::set<BrowserContextKeyedServiceFactory*>* factories) { |
135 DCHECK(factories); | 136 DCHECK(factories); |
136 factories->insert(ProfileOAuth2TokenServiceFactory::GetInstance()); | 137 factories->insert(ProfileOAuth2TokenServiceFactory::GetInstance()); |
137 factories->insert(SigninManagerFactory::GetInstance()); | 138 factories->insert(SigninManagerFactory::GetInstance()); |
138 factories->insert(drive::DriveNotificationManagerFactory::GetInstance()); | 139 factories->insert(drive::DriveNotificationManagerFactory::GetInstance()); |
139 } | 140 } |
OLD | NEW |