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

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

Issue 711433002: Enable device disabling during normal operation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@f_4_425574_add_device_disabling_manager
Patch Set: Address one more comment I had missed. 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 733 matching lines...) Expand 10 before | Expand all | Expand 10 after
744 744
745 // Let the UserManager and WallpaperManager unregister itself as an observer 745 // Let the UserManager and WallpaperManager unregister itself as an observer
746 // of the CrosSettings singleton before it is destroyed. This also ensures 746 // of the CrosSettings singleton before it is destroyed. This also ensures
747 // that the UserManager has no URLRequest pending (see 747 // that the UserManager has no URLRequest pending (see
748 // http://crbug.com/276659). 748 // http://crbug.com/276659).
749 g_browser_process->platform_part()->user_manager()->Shutdown(); 749 g_browser_process->platform_part()->user_manager()->Shutdown();
750 #if !defined(USE_ATHENA) 750 #if !defined(USE_ATHENA)
751 WallpaperManager::Get()->Shutdown(); 751 WallpaperManager::Get()->Shutdown();
752 #endif 752 #endif
753 753
754 // Let the DeviceDisablingManager unregister itself as an observer of the
755 // CrosSettings singleton before it is destroyed.
754 g_browser_process->platform_part()->ShutdownDeviceDisablingManager(); 756 g_browser_process->platform_part()->ShutdownDeviceDisablingManager();
755 757
756 // Let the AutomaticRebootManager unregister itself as an observer of several 758 // Let the AutomaticRebootManager unregister itself as an observer of several
757 // subsystems. 759 // subsystems.
758 g_browser_process->platform_part()->ShutdownAutomaticRebootManager(); 760 g_browser_process->platform_part()->ShutdownAutomaticRebootManager();
759 761
760 // Clean up dependency on CrosSettings and stop pending data fetches. 762 // Clean up dependency on CrosSettings and stop pending data fetches.
761 KioskAppManager::Shutdown(); 763 KioskAppManager::Shutdown();
762 764
763 // Give BrowserPolicyConnectorChromeOS a chance to unregister any observers 765 // Give BrowserPolicyConnectorChromeOS a chance to unregister any observers
(...skipping 26 matching lines...) Expand all
790 // Destroy DBus services immediately after threads are stopped. 792 // Destroy DBus services immediately after threads are stopped.
791 dbus_services_.reset(); 793 dbus_services_.reset();
792 794
793 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 795 ChromeBrowserMainPartsLinux::PostDestroyThreads();
794 796
795 // Destroy DeviceSettingsService after g_browser_process. 797 // Destroy DeviceSettingsService after g_browser_process.
796 DeviceSettingsService::Shutdown(); 798 DeviceSettingsService::Shutdown();
797 } 799 }
798 800
799 } // namespace chromeos 801 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/browser_process_platform_part_chromeos.cc ('k') | chrome/browser/chromeos/login/existing_user_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698