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

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

Issue 2463023002: Revert of Add network throttling as an enterprise policy (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Reverted by hand Created 4 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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 #include "chrome/browser/chromeos/login/lock/screen_locker.h" 54 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
55 #include "chrome/browser/chromeos/login/login_wizard.h" 55 #include "chrome/browser/chromeos/login/login_wizard.h"
56 #include "chrome/browser/chromeos/login/session/chrome_session_manager.h" 56 #include "chrome/browser/chromeos/login/session/chrome_session_manager.h"
57 #include "chrome/browser/chromeos/login/session/user_session_manager.h" 57 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
58 #include "chrome/browser/chromeos/login/startup_utils.h" 58 #include "chrome/browser/chromeos/login/startup_utils.h"
59 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" 59 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
60 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" 60 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
61 #include "chrome/browser/chromeos/login/wizard_controller.h" 61 #include "chrome/browser/chromeos/login/wizard_controller.h"
62 #include "chrome/browser/chromeos/net/network_connect_delegate_chromeos.h" 62 #include "chrome/browser/chromeos/net/network_connect_delegate_chromeos.h"
63 #include "chrome/browser/chromeos/net/network_portal_detector_impl.h" 63 #include "chrome/browser/chromeos/net/network_portal_detector_impl.h"
64 #include "chrome/browser/chromeos/net/network_throttling_observer.h"
65 #include "chrome/browser/chromeos/net/wake_on_wifi_manager.h" 64 #include "chrome/browser/chromeos/net/wake_on_wifi_manager.h"
66 #include "chrome/browser/chromeos/options/cert_library.h" 65 #include "chrome/browser/chromeos/options/cert_library.h"
67 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_fact ory.h" 66 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_fact ory.h"
68 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 67 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
69 #include "chrome/browser/chromeos/policy/device_local_account.h" 68 #include "chrome/browser/chromeos/policy/device_local_account.h"
70 #include "chrome/browser/chromeos/power/freezer_cgroup_process_manager.h" 69 #include "chrome/browser/chromeos/power/freezer_cgroup_process_manager.h"
71 #include "chrome/browser/chromeos/power/idle_action_warning_observer.h" 70 #include "chrome/browser/chromeos/power/idle_action_warning_observer.h"
72 #include "chrome/browser/chromeos/power/login_lock_state_notifier.h" 71 #include "chrome/browser/chromeos/power/login_lock_state_notifier.h"
73 #include "chrome/browser/chromeos/power/peripheral_battery_observer.h" 72 #include "chrome/browser/chromeos/power/peripheral_battery_observer.h"
74 #include "chrome/browser/chromeos/power/power_data_collector.h" 73 #include "chrome/browser/chromeos/power/power_data_collector.h"
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
406 content::BrowserThread::GetTaskRunnerForThread( 405 content::BrowserThread::GetTaskRunnerForThread(
407 content::BrowserThread::FILE), 406 content::BrowserThread::FILE),
408 load_oem_statistics); 407 load_oem_statistics);
409 408
410 base::FilePath downloads_directory; 409 base::FilePath downloads_directory;
411 CHECK(PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_directory)); 410 CHECK(PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_directory));
412 411
413 DeviceOAuth2TokenServiceFactory::Initialize(); 412 DeviceOAuth2TokenServiceFactory::Initialize();
414 413
415 wake_on_wifi_manager_.reset(new WakeOnWifiManager()); 414 wake_on_wifi_manager_.reset(new WakeOnWifiManager());
416 network_throttling_observer_.reset(
417 new NetworkThrottlingObserver(g_browser_process->local_state()));
418 415
419 arc_service_launcher_.reset(new arc::ArcServiceLauncher()); 416 arc_service_launcher_.reset(new arc::ArcServiceLauncher());
420 arc_service_launcher_->Initialize(); 417 arc_service_launcher_->Initialize();
421 418
422 chromeos::ResourceReporter::GetInstance()->StartMonitoring( 419 chromeos::ResourceReporter::GetInstance()->StartMonitoring(
423 task_manager::TaskManagerInterface::GetTaskManager()); 420 task_manager::TaskManagerInterface::GetTaskManager());
424 421
425 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); 422 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun();
426 } 423 }
427 424
(...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after
796 // BrowserPolicyConnector (owned by g_browser_process). 793 // BrowserPolicyConnector (owned by g_browser_process).
797 DeviceSettingsService::Get()->UnsetSessionManager(); 794 DeviceSettingsService::Get()->UnsetSessionManager();
798 795
799 // We should remove observers attached to D-Bus clients before 796 // We should remove observers attached to D-Bus clients before
800 // DBusThreadManager is shut down. 797 // DBusThreadManager is shut down.
801 extension_volume_observer_.reset(); 798 extension_volume_observer_.reset();
802 peripheral_battery_observer_.reset(); 799 peripheral_battery_observer_.reset();
803 power_prefs_.reset(); 800 power_prefs_.reset();
804 renderer_freezer_.reset(); 801 renderer_freezer_.reset();
805 wake_on_wifi_manager_.reset(); 802 wake_on_wifi_manager_.reset();
806 network_throttling_observer_.reset();
807 ScreenLocker::ShutDownClass(); 803 ScreenLocker::ShutDownClass();
808 keyboard_event_rewriters_.reset(); 804 keyboard_event_rewriters_.reset();
809 low_disk_notification_.reset(); 805 low_disk_notification_.reset();
810 #if defined(USE_X11) 806 #if defined(USE_X11)
811 if (!chrome::IsRunningInMash()) { 807 if (!chrome::IsRunningInMash()) {
812 // The XInput2 event listener needs to be shut down earlier than when 808 // The XInput2 event listener needs to be shut down earlier than when
813 // Singletons are finally destroyed in AtExitManager. 809 // Singletons are finally destroyed in AtExitManager.
814 XInputHierarchyChangedEventListener::GetInstance()->Stop(); 810 XInputHierarchyChangedEventListener::GetInstance()->Stop();
815 811
816 DeviceUMA::GetInstance()->Stop(); 812 DeviceUMA::GetInstance()->Stop();
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
890 // Destroy DBus services immediately after threads are stopped. 886 // Destroy DBus services immediately after threads are stopped.
891 dbus_services_.reset(); 887 dbus_services_.reset();
892 888
893 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 889 ChromeBrowserMainPartsLinux::PostDestroyThreads();
894 890
895 // Destroy DeviceSettingsService after g_browser_process. 891 // Destroy DeviceSettingsService after g_browser_process.
896 DeviceSettingsService::Shutdown(); 892 DeviceSettingsService::Shutdown();
897 } 893 }
898 894
899 } // namespace chromeos 895 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/chrome_browser_main_chromeos.h ('k') | chrome/browser/chromeos/net/network_throttling_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698