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

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

Issue 21115004: extensions: Remove chrome.webSocketProxyPrivate API (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 4 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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 #include "chrome/browser/chromeos/power/video_activity_notifier.h" 67 #include "chrome/browser/chromeos/power/video_activity_notifier.h"
68 #include "chrome/browser/chromeos/profiles/profile_helper.h" 68 #include "chrome/browser/chromeos/profiles/profile_helper.h"
69 #include "chrome/browser/chromeos/screensaver/screensaver_controller.h" 69 #include "chrome/browser/chromeos/screensaver/screensaver_controller.h"
70 #include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h " 70 #include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h "
71 #include "chrome/browser/chromeos/settings/device_settings_service.h" 71 #include "chrome/browser/chromeos/settings/device_settings_service.h"
72 #include "chrome/browser/chromeos/settings/owner_key_util.h" 72 #include "chrome/browser/chromeos/settings/owner_key_util.h"
73 #include "chrome/browser/chromeos/swap_metrics.h" 73 #include "chrome/browser/chromeos/swap_metrics.h"
74 #include "chrome/browser/chromeos/system/statistics_provider.h" 74 #include "chrome/browser/chromeos/system/statistics_provider.h"
75 #include "chrome/browser/chromeos/system_key_event_listener.h" 75 #include "chrome/browser/chromeos/system_key_event_listener.h"
76 #include "chrome/browser/chromeos/upgrade_detector_chromeos.h" 76 #include "chrome/browser/chromeos/upgrade_detector_chromeos.h"
77 #include "chrome/browser/chromeos/web_socket_proxy_controller.h"
78 #include "chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h" 77 #include "chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h"
79 #include "chrome/browser/defaults.h" 78 #include "chrome/browser/defaults.h"
80 #include "chrome/browser/metrics/metrics_service.h" 79 #include "chrome/browser/metrics/metrics_service.h"
81 #include "chrome/browser/net/chrome_network_delegate.h" 80 #include "chrome/browser/net/chrome_network_delegate.h"
82 #include "chrome/browser/policy/browser_policy_connector.h" 81 #include "chrome/browser/policy/browser_policy_connector.h"
83 #include "chrome/browser/profiles/profile.h" 82 #include "chrome/browser/profiles/profile.h"
84 #include "chrome/browser/profiles/profile_manager.h" 83 #include "chrome/browser/profiles/profile_manager.h"
85 #include "chrome/browser/rlz/rlz.h" 84 #include "chrome/browser/rlz/rlz.h"
86 #include "chrome/common/chrome_paths.h" 85 #include "chrome/common/chrome_paths.h"
87 #include "chrome/common/chrome_switches.h" 86 #include "chrome/common/chrome_switches.h"
(...skipping 684 matching lines...) Expand 10 before | Expand all | Expand 10 after
772 #if defined(USE_X11) 771 #if defined(USE_X11)
773 DeviceUMA::GetInstance()->Stop(); 772 DeviceUMA::GetInstance()->Stop();
774 #endif 773 #endif
775 774
776 // SystemKeyEventListener::Shutdown() is always safe to call, 775 // SystemKeyEventListener::Shutdown() is always safe to call,
777 // even if Initialize() wasn't called. 776 // even if Initialize() wasn't called.
778 SystemKeyEventListener::Shutdown(); 777 SystemKeyEventListener::Shutdown();
779 imageburner::BurnManager::Shutdown(); 778 imageburner::BurnManager::Shutdown();
780 CrasAudioHandler::Shutdown(); 779 CrasAudioHandler::Shutdown();
781 780
782 WebSocketProxyController::Shutdown();
783
784 // Let classes unregister themselves as observers of the ash::Shell singleton 781 // Let classes unregister themselves as observers of the ash::Shell singleton
785 // before the shell is destroyed. 782 // before the shell is destroyed.
786 user_activity_notifier_.reset(); 783 user_activity_notifier_.reset();
787 video_activity_notifier_.reset(); 784 video_activity_notifier_.reset();
788 display_configuration_observer_.reset(); 785 display_configuration_observer_.reset();
789 786
790 // Detach D-Bus clients before DBusThreadManager is shut down. 787 // Detach D-Bus clients before DBusThreadManager is shut down.
791 power_button_observer_.reset(); 788 power_button_observer_.reset();
792 screensaver_controller_.reset(); 789 screensaver_controller_.reset();
793 idle_action_warning_observer_.reset(); 790 idle_action_warning_observer_.reset();
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
827 824
828 // Destroy DeviceSettingsService after g_browser_process. 825 // Destroy DeviceSettingsService after g_browser_process.
829 DeviceSettingsService::Shutdown(); 826 DeviceSettingsService::Shutdown();
830 } 827 }
831 828
832 void ChromeBrowserMainPartsChromeos::SetupPlatformFieldTrials() { 829 void ChromeBrowserMainPartsChromeos::SetupPlatformFieldTrials() {
833 default_pinned_apps_field_trial::SetupTrial(); 830 default_pinned_apps_field_trial::SetupTrial();
834 } 831 }
835 832
836 } // namespace chromeos 833 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chrome_notification_types.h ('k') | chrome/browser/chromeos/extensions/input_method_event_router.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698