chrome/browser/chromeos/chrome_browser_main_chromeos.cc - Issue 9146007: Get rid of BrowserThread::WEB_SOCKET_PROXY. BrowserThread is only for threads that are used in ma...

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

Issue 9146007: Get rid of BrowserThread::WEB_SOCKET_PROXY. BrowserThread is only for threads that are used in ma... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 8 years, 11 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

« no previous file with comments | « chrome/browser/browser_process_impl.cc ('k') | chrome/browser/chromeos/web_socket_proxy_controller.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 "base/bind.h"	7 #include "base/bind.h"

8 #include "base/callback.h"	8 #include "base/callback.h"

9 #include "base/command_line.h"	9 #include "base/command_line.h"

10 #include "base/lazy_instance.h"	10 #include "base/lazy_instance.h"

(...skipping 21 matching lines...) Expand all Loading...
32 #include "chrome/browser/chromeos/login/session_manager_observer.h"	32 #include "chrome/browser/chromeos/login/session_manager_observer.h"

33 #include "chrome/browser/chromeos/login/user_manager.h"	33 #include "chrome/browser/chromeos/login/user_manager.h"

34 #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h"	34 #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h"

35 #include "chrome/browser/chromeos/net/network_change_notifier_chromeos.h"	35 #include "chrome/browser/chromeos/net/network_change_notifier_chromeos.h"

36 #include "chrome/browser/chromeos/power/brightness_observer.h"	36 #include "chrome/browser/chromeos/power/brightness_observer.h"

37 #include "chrome/browser/chromeos/status/status_area_view_chromeos.h"	37 #include "chrome/browser/chromeos/status/status_area_view_chromeos.h"

38 #include "chrome/browser/chromeos/system/runtime_environment.h"	38 #include "chrome/browser/chromeos/system/runtime_environment.h"

39 #include "chrome/browser/chromeos/system/statistics_provider.h"	39 #include "chrome/browser/chromeos/system/statistics_provider.h"

40 #include "chrome/browser/chromeos/system_key_event_listener.h"	40 #include "chrome/browser/chromeos/system_key_event_listener.h"

41 #include "chrome/browser/chromeos/upgrade_detector_chromeos.h"	41 #include "chrome/browser/chromeos/upgrade_detector_chromeos.h"

	42 #include "chrome/browser/chromeos/web_socket_proxy_controller.h"

42 #include "chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h"	43 #include "chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h"

43 #include "chrome/browser/defaults.h"	44 #include "chrome/browser/defaults.h"

44 #include "chrome/browser/metrics/metrics_service.h"	45 #include "chrome/browser/metrics/metrics_service.h"

45 #include "chrome/browser/oom_priority_manager.h"	46 #include "chrome/browser/oom_priority_manager.h"

46 #include "chrome/browser/policy/browser_policy_connector.h"	47 #include "chrome/browser/policy/browser_policy_connector.h"

47 #include "chrome/browser/profiles/profile.h"	48 #include "chrome/browser/profiles/profile.h"

48 #include "chrome/browser/profiles/profile_manager.h"	49 #include "chrome/browser/profiles/profile_manager.h"

49 #include "chrome/browser/ui/views/browser_dialogs.h"	50 #include "chrome/browser/ui/views/browser_dialogs.h"

50 #include "chrome/common/chrome_switches.h"	51 #include "chrome/common/chrome_switches.h"

51 #include "chrome/common/logging_chrome.h"	52 #include "chrome/common/logging_chrome.h"

(...skipping 449 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
501	502

502 // The XInput2 event listener needs to be shut down earlier than when	503 // The XInput2 event listener needs to be shut down earlier than when

503 // Singletons are finally destroyed in AtExitManager.	504 // Singletons are finally destroyed in AtExitManager.

504 chromeos::XInputHierarchyChangedEventListener::GetInstance()->Stop();	505 chromeos::XInputHierarchyChangedEventListener::GetInstance()->Stop();

505	506

506 // chromeos::SystemKeyEventListener::Shutdown() is always safe to call,	507 // chromeos::SystemKeyEventListener::Shutdown() is always safe to call,

507 // even if Initialize() wasn't called.	508 // even if Initialize() wasn't called.

508 chromeos::SystemKeyEventListener::Shutdown();	509 chromeos::SystemKeyEventListener::Shutdown();

509 chromeos::AudioHandler::Shutdown();	510 chromeos::AudioHandler::Shutdown();

510	511

	512 chromeos::WebSocketProxyController::Shutdown();

	513

511 ChromeBrowserMainPartsLinux::PostMainMessageLoopRun();	514 ChromeBrowserMainPartsLinux::PostMainMessageLoopRun();

512 }	515 }

OLD	NEW