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

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

Issue 14566009: Add NetworkConnectionHandler class (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Modify Shill stubs Created 7 years, 7 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 | Annotate | Revision Log
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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 #include "chromeos/disks/disk_mount_manager.h" 104 #include "chromeos/disks/disk_mount_manager.h"
105 #include "chromeos/ime/input_method_manager.h" 105 #include "chromeos/ime/input_method_manager.h"
106 #include "chromeos/ime/xkeyboard.h" 106 #include "chromeos/ime/xkeyboard.h"
107 #include "chromeos/login/login_state.h" 107 #include "chromeos/login/login_state.h"
108 #include "chromeos/network/cert_loader.h" 108 #include "chromeos/network/cert_loader.h"
109 #include "chromeos/network/geolocation_handler.h" 109 #include "chromeos/network/geolocation_handler.h"
110 #include "chromeos/network/managed_network_configuration_handler.h" 110 #include "chromeos/network/managed_network_configuration_handler.h"
111 #include "chromeos/network/network_change_notifier_chromeos.h" 111 #include "chromeos/network/network_change_notifier_chromeos.h"
112 #include "chromeos/network/network_change_notifier_factory_chromeos.h" 112 #include "chromeos/network/network_change_notifier_factory_chromeos.h"
113 #include "chromeos/network/network_configuration_handler.h" 113 #include "chromeos/network/network_configuration_handler.h"
114 #include "chromeos/network/network_connection_handler.h"
114 #include "chromeos/network/network_event_log.h" 115 #include "chromeos/network/network_event_log.h"
115 #include "chromeos/network/network_state_handler.h" 116 #include "chromeos/network/network_state_handler.h"
116 #include "content/public/browser/browser_thread.h" 117 #include "content/public/browser/browser_thread.h"
117 #include "content/public/browser/notification_service.h" 118 #include "content/public/browser/notification_service.h"
118 #include "content/public/browser/power_save_blocker.h" 119 #include "content/public/browser/power_save_blocker.h"
119 #include "content/public/common/main_function_params.h" 120 #include "content/public/common/main_function_params.h"
120 #include "grit/platform_locale_settings.h" 121 #include "grit/platform_locale_settings.h"
121 #include "net/base/network_change_notifier.h" 122 #include "net/base/network_change_notifier.h"
122 #include "net/url_request/url_request.h" 123 #include "net/url_request/url_request.h"
123 #include "net/url_request/url_request_context_getter.h" 124 #include "net/url_request/url_request_context_getter.h"
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 cryptohome::AsyncMethodCaller::Initialize(); 320 cryptohome::AsyncMethodCaller::Initialize();
320 321
321 // Always initialize these handlers which should not conflict with 322 // Always initialize these handlers which should not conflict with
322 // NetworkLibrary. 323 // NetworkLibrary.
323 network_event_log::Initialize(); 324 network_event_log::Initialize();
324 GeolocationHandler::Initialize(); 325 GeolocationHandler::Initialize();
325 NetworkStateHandler::Initialize(); 326 NetworkStateHandler::Initialize();
326 327
327 NetworkConfigurationHandler::Initialize(); 328 NetworkConfigurationHandler::Initialize();
328 ManagedNetworkConfigurationHandler::Initialize(); 329 ManagedNetworkConfigurationHandler::Initialize();
330 NetworkConnectionHandler::Initialize();
329 331
330 // Initialize the network change notifier for Chrome OS. The network 332 // Initialize the network change notifier for Chrome OS. The network
331 // change notifier starts to monitor changes from the power manager and 333 // change notifier starts to monitor changes from the power manager and
332 // the network manager. 334 // the network manager.
333 if (!CommandLine::ForCurrentProcess()->HasSwitch( 335 if (!CommandLine::ForCurrentProcess()->HasSwitch(
334 chromeos::switches::kDisableNewNetworkChangeNotifier)) { 336 chromeos::switches::kDisableNewNetworkChangeNotifier)) {
335 NetworkChangeNotifierFactoryChromeos::GetInstance()->Initialize(); 337 NetworkChangeNotifierFactoryChromeos::GetInstance()->Initialize();
336 } else { 338 } else {
337 CrosNetworkChangeNotifierFactory::GetInstance()->Init(); 339 CrosNetworkChangeNotifierFactory::GetInstance()->Init();
338 } 340 }
(...skipping 21 matching lines...) Expand all
360 ~DBusServices() { 362 ~DBusServices() {
361 ConnectivityStateHelper::Shutdown(); 363 ConnectivityStateHelper::Shutdown();
362 // CrosLibrary is shut down before DBusThreadManager even though it 364 // CrosLibrary is shut down before DBusThreadManager even though it
363 // is initialized first becuase some of its libraries depend on DBus 365 // is initialized first becuase some of its libraries depend on DBus
364 // clients. 366 // clients.
365 // TODO(hashimoto): Resolve this situation by removing CrosLibrary. 367 // TODO(hashimoto): Resolve this situation by removing CrosLibrary.
366 // (crosbug.com/26160) 368 // (crosbug.com/26160)
367 if (cros_initialized_ && CrosLibrary::Get()) 369 if (cros_initialized_ && CrosLibrary::Get())
368 CrosLibrary::Shutdown(); 370 CrosLibrary::Shutdown();
369 371
372 NetworkConnectionHandler::Shutdown();
370 ManagedNetworkConfigurationHandler::Shutdown(); 373 ManagedNetworkConfigurationHandler::Shutdown();
371 NetworkConfigurationHandler::Shutdown(); 374 NetworkConfigurationHandler::Shutdown();
372 375
373 NetworkStateHandler::Shutdown(); 376 NetworkStateHandler::Shutdown();
374 GeolocationHandler::Shutdown(); 377 GeolocationHandler::Shutdown();
375 network_event_log::Shutdown(); 378 network_event_log::Shutdown();
376 379
377 cryptohome::AsyncMethodCaller::Shutdown(); 380 cryptohome::AsyncMethodCaller::Shutdown();
378 disks::DiskMountManager::Shutdown(); 381 disks::DiskMountManager::Shutdown();
379 input_method::Shutdown(); 382 input_method::Shutdown();
(...skipping 517 matching lines...) Expand 10 before | Expand all | Expand 10 after
897 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0); 900 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0);
898 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0); 901 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0);
899 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0); 902 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0);
900 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0); 903 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0);
901 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0); 904 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0);
902 // This is necessary to start the experiment as a side effect. 905 // This is necessary to start the experiment as a side effect.
903 trial->group(); 906 trial->group();
904 } 907 }
905 908
906 } // namespace chromeos 909 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698