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

Side by Side Diff: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

Issue 1552863003: Global conversion of Pass()→std::move(): CrOS edition (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« no previous file with comments | « chrome/browser/policy/policy_browsertest.cc ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/profiles/chrome_browser_main_extra_parts_profiles.h" 5 #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h"
6 6
7 #include <utility>
8
7 #include "build/build_config.h" 9 #include "build/build_config.h"
8 #include "chrome/browser/autocomplete/in_memory_url_index_factory.h" 10 #include "chrome/browser/autocomplete/in_memory_url_index_factory.h"
9 #include "chrome/browser/autocomplete/shortcuts_backend_factory.h" 11 #include "chrome/browser/autocomplete/shortcuts_backend_factory.h"
10 #include "chrome/browser/autofill/personal_data_manager_factory.h" 12 #include "chrome/browser/autofill/personal_data_manager_factory.h"
11 #include "chrome/browser/background/background_contents_service_factory.h" 13 #include "chrome/browser/background/background_contents_service_factory.h"
12 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 14 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
13 #include "chrome/browser/chrome_browser_main.h" 15 #include "chrome/browser/chrome_browser_main.h"
14 #include "chrome/browser/content_settings/cookie_settings_factory.h" 16 #include "chrome/browser/content_settings/cookie_settings_factory.h"
15 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" 17 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
16 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h" 18 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 SupervisedUserSyncServiceFactory::GetInstance(); 258 SupervisedUserSyncServiceFactory::GetInstance();
257 #endif 259 #endif
258 #endif 260 #endif
259 #if defined(ENABLE_EXTENSIONS) 261 #if defined(ENABLE_EXTENSIONS)
260 #if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_MACOSX) 262 #if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_MACOSX)
261 scoped_ptr<extensions::NetworkingPrivateVerifyDelegateFactoryImpl> 263 scoped_ptr<extensions::NetworkingPrivateVerifyDelegateFactoryImpl>
262 networking_private_verify_delegate_factory( 264 networking_private_verify_delegate_factory(
263 new extensions::NetworkingPrivateVerifyDelegateFactoryImpl); 265 new extensions::NetworkingPrivateVerifyDelegateFactoryImpl);
264 extensions::NetworkingPrivateDelegateFactory::GetInstance() 266 extensions::NetworkingPrivateDelegateFactory::GetInstance()
265 ->SetVerifyDelegateFactory( 267 ->SetVerifyDelegateFactory(
266 networking_private_verify_delegate_factory.Pass()); 268 std::move(networking_private_verify_delegate_factory));
267 scoped_ptr<extensions::NetworkingPrivateUIDelegateFactoryImpl> 269 scoped_ptr<extensions::NetworkingPrivateUIDelegateFactoryImpl>
268 networking_private_ui_delegate_factory( 270 networking_private_ui_delegate_factory(
269 new extensions::NetworkingPrivateUIDelegateFactoryImpl); 271 new extensions::NetworkingPrivateUIDelegateFactoryImpl);
270 extensions::NetworkingPrivateDelegateFactory::GetInstance() 272 extensions::NetworkingPrivateDelegateFactory::GetInstance()
271 ->SetUIDelegateFactory(networking_private_ui_delegate_factory.Pass()); 273 ->SetUIDelegateFactory(std::move(networking_private_ui_delegate_factory));
272 #endif 274 #endif
273 #endif 275 #endif
274 #if !defined(OS_ANDROID) 276 #if !defined(OS_ANDROID)
275 MediaGalleriesPreferencesFactory::GetInstance(); 277 MediaGalleriesPreferencesFactory::GetInstance();
276 NTPResourceCacheFactory::GetInstance(); 278 NTPResourceCacheFactory::GetInstance();
277 #endif 279 #endif
278 NTPSnippetsServiceFactory::GetInstance(); 280 NTPSnippetsServiceFactory::GetInstance();
279 PasswordStoreFactory::GetInstance(); 281 PasswordStoreFactory::GetInstance();
280 PasswordManagerSettingMigratorServiceFactory::GetInstance(); 282 PasswordManagerSettingMigratorServiceFactory::GetInstance();
281 #if !defined(OS_ANDROID) 283 #if !defined(OS_ANDROID)
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 #endif 339 #endif
338 #if !defined(OS_ANDROID) 340 #if !defined(OS_ANDROID)
339 UsbChooserContextFactory::GetInstance(); 341 UsbChooserContextFactory::GetInstance();
340 #endif 342 #endif
341 WebDataServiceFactory::GetInstance(); 343 WebDataServiceFactory::GetInstance();
342 } 344 }
343 345
344 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() { 346 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() {
345 EnsureBrowserContextKeyedServiceFactoriesBuilt(); 347 EnsureBrowserContextKeyedServiceFactoriesBuilt();
346 } 348 }
OLDNEW
« no previous file with comments | « chrome/browser/policy/policy_browsertest.cc ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698