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

Side by Side Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 2257103002: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/chromeos/chrome_browser_main_chromeos.h" 5 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 bluez::BluezDBusManager::Initialize( 205 bluez::BluezDBusManager::Initialize(
206 DBusThreadManager::Get()->GetSystemBus(), 206 DBusThreadManager::Get()->GetSystemBus(),
207 chromeos::DBusThreadManager::Get()->IsUsingStub( 207 chromeos::DBusThreadManager::Get()->IsUsingStub(
208 chromeos::DBusClientBundle::BLUETOOTH)); 208 chromeos::DBusClientBundle::BLUETOOTH));
209 209
210 PowerPolicyController::Initialize( 210 PowerPolicyController::Initialize(
211 DBusThreadManager::Get()->GetPowerManagerClient()); 211 DBusThreadManager::Get()->GetPowerManagerClient());
212 212
213 ScopedVector<CrosDBusService::ServiceProviderInterface> service_providers; 213 ScopedVector<CrosDBusService::ServiceProviderInterface> service_providers;
214 service_providers.push_back(ProxyResolutionServiceProvider::Create( 214 service_providers.push_back(ProxyResolutionServiceProvider::Create(
215 base::WrapUnique(new ChromeProxyResolverDelegate()))); 215 base::MakeUnique<ChromeProxyResolverDelegate>()));
216 service_providers.push_back(new DisplayPowerServiceProvider( 216 service_providers.push_back(new DisplayPowerServiceProvider(
217 base::WrapUnique(new ChromeDisplayPowerServiceProviderDelegate))); 217 base::WrapUnique(new ChromeDisplayPowerServiceProviderDelegate)));
218 service_providers.push_back(new LivenessServiceProvider); 218 service_providers.push_back(new LivenessServiceProvider);
219 service_providers.push_back(new ScreenLockServiceProvider); 219 service_providers.push_back(new ScreenLockServiceProvider);
220 service_providers.push_back(new ConsoleServiceProvider( 220 service_providers.push_back(new ConsoleServiceProvider(
221 base::WrapUnique(new ChromeConsoleServiceProviderDelegate))); 221 base::WrapUnique(new ChromeConsoleServiceProviderDelegate)));
222 service_providers.push_back(new KioskInfoService); 222 service_providers.push_back(new KioskInfoService);
223 CrosDBusService::Initialize(std::move(service_providers)); 223 CrosDBusService::Initialize(std::move(service_providers));
224 224
225 // Initialize PowerDataCollector after DBusThreadManager is initialized. 225 // Initialize PowerDataCollector after DBusThreadManager is initialized.
(...skipping 648 matching lines...) Expand 10 before | Expand all | Expand 10 after
874 // Destroy DBus services immediately after threads are stopped. 874 // Destroy DBus services immediately after threads are stopped.
875 dbus_services_.reset(); 875 dbus_services_.reset();
876 876
877 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 877 ChromeBrowserMainPartsLinux::PostDestroyThreads();
878 878
879 // Destroy DeviceSettingsService after g_browser_process. 879 // Destroy DeviceSettingsService after g_browser_process.
880 DeviceSettingsService::Shutdown(); 880 DeviceSettingsService::Shutdown();
881 } 881 }
882 882
883 } // namespace chromeos 883 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698