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

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

Issue 686503002: Move network_connect code to ui/chromeos/network (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase + more gn fixes Created 6 years, 1 month 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 <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/ash_switches.h" 10 #include "ash/ash_switches.h"
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 NetworkHandler::Initialize(); 178 NetworkHandler::Initialize();
179 CertLibrary::Initialize(); 179 CertLibrary::Initialize();
180 180
181 // Initialize the network change notifier for Chrome OS. The network 181 // Initialize the network change notifier for Chrome OS. The network
182 // change notifier starts to monitor changes from the power manager and 182 // change notifier starts to monitor changes from the power manager and
183 // the network manager. 183 // the network manager.
184 NetworkChangeNotifierFactoryChromeos::GetInstance()->Initialize(); 184 NetworkChangeNotifierFactoryChromeos::GetInstance()->Initialize();
185 185
186 // Initialize the NetworkConnect handler. 186 // Initialize the NetworkConnect handler.
187 network_connect_delegate_.reset(new NetworkConnectDelegateChromeOS); 187 network_connect_delegate_.reset(new NetworkConnectDelegateChromeOS);
188 ash::NetworkConnect::Initialize(network_connect_delegate_.get()); 188 ui::NetworkConnect::Initialize(network_connect_delegate_.get());
189 189
190 // Likewise, initialize the upgrade detector for Chrome OS. The upgrade 190 // Likewise, initialize the upgrade detector for Chrome OS. The upgrade
191 // detector starts to monitor changes from the update engine. 191 // detector starts to monitor changes from the update engine.
192 UpgradeDetectorChromeos::GetInstance()->Init(); 192 UpgradeDetectorChromeos::GetInstance()->Init();
193 193
194 // Initialize the device settings service so that we'll take actions per 194 // Initialize the device settings service so that we'll take actions per
195 // signals sent from the session manager. This needs to happen before 195 // signals sent from the session manager. This needs to happen before
196 // g_browser_process initializes BrowserPolicyConnector. 196 // g_browser_process initializes BrowserPolicyConnector.
197 DeviceSettingsService::Initialize(); 197 DeviceSettingsService::Initialize();
198 DeviceSettingsService::Get()->SetSessionManager( 198 DeviceSettingsService::Get()->SetSessionManager(
199 DBusThreadManager::Get()->GetSessionManagerClient(), 199 DBusThreadManager::Get()->GetSessionManagerClient(),
200 OwnerSettingsServiceChromeOSFactory::GetInstance()->GetOwnerKeyUtil()); 200 OwnerSettingsServiceChromeOSFactory::GetInstance()->GetOwnerKeyUtil());
201 } 201 }
202 202
203 ~DBusServices() { 203 ~DBusServices() {
204 ash::NetworkConnect::Shutdown(); 204 ui::NetworkConnect::Shutdown();
205 network_connect_delegate_.reset(); 205 network_connect_delegate_.reset();
206 206
207 CertLibrary::Shutdown(); 207 CertLibrary::Shutdown();
208 NetworkHandler::Shutdown(); 208 NetworkHandler::Shutdown();
209 209
210 cryptohome::AsyncMethodCaller::Shutdown(); 210 cryptohome::AsyncMethodCaller::Shutdown();
211 disks::DiskMountManager::Shutdown(); 211 disks::DiskMountManager::Shutdown();
212 212
213 SystemSaltGetter::Shutdown(); 213 SystemSaltGetter::Shutdown();
214 LoginState::Shutdown(); 214 LoginState::Shutdown();
(...skipping 565 matching lines...) Expand 10 before | Expand all | Expand 10 after
780 // Destroy DBus services immediately after threads are stopped. 780 // Destroy DBus services immediately after threads are stopped.
781 dbus_services_.reset(); 781 dbus_services_.reset();
782 782
783 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 783 ChromeBrowserMainPartsLinux::PostDestroyThreads();
784 784
785 // Destroy DeviceSettingsService after g_browser_process. 785 // Destroy DeviceSettingsService after g_browser_process.
786 DeviceSettingsService::Shutdown(); 786 DeviceSettingsService::Shutdown();
787 } 787 }
788 788
789 } // namespace chromeos 789 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698