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

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

Issue 542623002: Minimal support for OOBE/login for chrome-athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments resolved Created 6 years, 3 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 <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 690 matching lines...) Expand 10 before | Expand all | Expand 10 after
701 imageburner::BurnManager::Shutdown(); 701 imageburner::BurnManager::Shutdown();
702 CrasAudioHandler::Shutdown(); 702 CrasAudioHandler::Shutdown();
703 703
704 // Detach D-Bus clients before DBusThreadManager is shut down. 704 // Detach D-Bus clients before DBusThreadManager is shut down.
705 power_button_observer_.reset(); 705 power_button_observer_.reset();
706 idle_action_warning_observer_.reset(); 706 idle_action_warning_observer_.reset();
707 707
708 #if !defined(USE_ATHENA) 708 #if !defined(USE_ATHENA)
709 MagnificationManager::Shutdown(); 709 MagnificationManager::Shutdown();
710 #endif 710 #endif
711
711 AccessibilityManager::Shutdown(); 712 AccessibilityManager::Shutdown();
712 713
713 media::SoundsManager::Shutdown(); 714 media::SoundsManager::Shutdown();
714 715
715 system::StatisticsProvider::GetInstance()->Shutdown(); 716 system::StatisticsProvider::GetInstance()->Shutdown();
716 717
717 // Let the UserManager and WallpaperManager unregister itself as an observer 718 // Let the UserManager and WallpaperManager unregister itself as an observer
718 // of the CrosSettings singleton before it is destroyed. This also ensures 719 // of the CrosSettings singleton before it is destroyed. This also ensures
719 // that the UserManager has no URLRequest pending (see 720 // that the UserManager has no URLRequest pending (see
720 // http://crbug.com/276659). 721 // http://crbug.com/276659).
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
758 // Destroy DBus services immediately after threads are stopped. 759 // Destroy DBus services immediately after threads are stopped.
759 dbus_services_.reset(); 760 dbus_services_.reset();
760 761
761 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 762 ChromeBrowserMainPartsLinux::PostDestroyThreads();
762 763
763 // Destroy DeviceSettingsService after g_browser_process. 764 // Destroy DeviceSettingsService after g_browser_process.
764 DeviceSettingsService::Shutdown(); 765 DeviceSettingsService::Shutdown();
765 } 766 }
766 767
767 } // namespace chromeos 768 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698