OLD | NEW |
---|---|
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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
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/status/data_promo_notification.h" | 72 #include "chrome/browser/chromeos/status/data_promo_notification.h" |
73 #include "chrome/browser/chromeos/system/input_device_settings.h" | 73 #include "chrome/browser/chromeos/system/input_device_settings.h" |
74 #include "chrome/browser/chromeos/upgrade_detector_chromeos.h" | 74 #include "chrome/browser/chromeos/upgrade_detector_chromeos.h" |
75 #include "chrome/browser/defaults.h" | 75 #include "chrome/browser/defaults.h" |
76 #include "chrome/browser/lifetime/application_lifetime.h" | 76 #include "chrome/browser/lifetime/application_lifetime.h" |
77 #include "chrome/browser/net/chrome_network_delegate.h" | 77 #include "chrome/browser/net/chrome_network_delegate.h" |
78 #include "chrome/browser/profiles/profile.h" | 78 #include "chrome/browser/profiles/profile.h" |
79 #include "chrome/browser/profiles/profile_manager.h" | 79 #include "chrome/browser/profiles/profile_manager.h" |
80 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" | |
80 #include "chrome/browser/ui/ash/network_connect_delegate_chromeos.h" | 81 #include "chrome/browser/ui/ash/network_connect_delegate_chromeos.h" |
81 #include "chrome/common/channel_info.h" | 82 #include "chrome/common/channel_info.h" |
82 #include "chrome/common/chrome_constants.h" | 83 #include "chrome/common/chrome_constants.h" |
83 #include "chrome/common/chrome_paths.h" | 84 #include "chrome/common/chrome_paths.h" |
84 #include "chrome/common/chrome_switches.h" | 85 #include "chrome/common/chrome_switches.h" |
85 #include "chrome/common/logging_chrome.h" | 86 #include "chrome/common/logging_chrome.h" |
86 #include "chrome/common/pref_names.h" | 87 #include "chrome/common/pref_names.h" |
87 #include "chromeos/audio/audio_devices_pref_handler_impl.h" | 88 #include "chromeos/audio/audio_devices_pref_handler_impl.h" |
88 #include "chromeos/audio/cras_audio_handler.h" | 89 #include "chromeos/audio/cras_audio_handler.h" |
89 #include "chromeos/cert_loader.h" | 90 #include "chromeos/cert_loader.h" |
(...skipping 544 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
634 new RendererFreezer(scoped_ptr<RendererFreezer::Delegate>( | 635 new RendererFreezer(scoped_ptr<RendererFreezer::Delegate>( |
635 new FreezerCgroupProcessManager()))); | 636 new FreezerCgroupProcessManager()))); |
636 | 637 |
637 g_browser_process->platform_part()->InitializeAutomaticRebootManager(); | 638 g_browser_process->platform_part()->InitializeAutomaticRebootManager(); |
638 g_browser_process->platform_part()->InitializeDeviceDisablingManager(); | 639 g_browser_process->platform_part()->InitializeDeviceDisablingManager(); |
639 | 640 |
640 // This observer cannot be created earlier because it requires the shell to be | 641 // This observer cannot be created earlier because it requires the shell to be |
641 // available. | 642 // available. |
642 idle_action_warning_observer_.reset(new IdleActionWarningObserver()); | 643 idle_action_warning_observer_.reset(new IdleActionWarningObserver()); |
643 | 644 |
645 if (arc::ArcBridgeService::GetEnabled( | |
646 base::CommandLine::ForCurrentProcess())) { | |
647 DCHECK(arc_service_manager_); | |
648 arc_service_manager_->PostProfileInit( | |
649 multi_user_util::GetAccountIdFromProfile(profile())); | |
xiyuan
2015/12/21 22:56:36
IIRC, this code path is usually executed on the lo
yoshiki
2015/12/22 10:13:53
I checked that the previous code (hooking is in Po
xiyuan
2015/12/22 16:10:17
Interesting. That means the AccountId of profile i
| |
650 } | |
651 | |
644 ChromeBrowserMainPartsLinux::PostProfileInit(); | 652 ChromeBrowserMainPartsLinux::PostProfileInit(); |
645 } | 653 } |
646 | 654 |
647 void ChromeBrowserMainPartsChromeos::PreBrowserStart() { | 655 void ChromeBrowserMainPartsChromeos::PreBrowserStart() { |
648 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() | 656 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() |
649 // -- just before MetricsService::LogNeedForCleanShutdown(). | 657 // -- just before MetricsService::LogNeedForCleanShutdown(). |
650 | 658 |
651 // Start the external metrics service, which collects metrics from Chrome OS | 659 // Start the external metrics service, which collects metrics from Chrome OS |
652 // and passes them to the browser process. | 660 // and passes them to the browser process. |
653 external_metrics_ = new chromeos::ExternalMetrics; | 661 external_metrics_ = new chromeos::ExternalMetrics; |
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
823 // Destroy DBus services immediately after threads are stopped. | 831 // Destroy DBus services immediately after threads are stopped. |
824 dbus_services_.reset(); | 832 dbus_services_.reset(); |
825 | 833 |
826 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 834 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
827 | 835 |
828 // Destroy DeviceSettingsService after g_browser_process. | 836 // Destroy DeviceSettingsService after g_browser_process. |
829 DeviceSettingsService::Shutdown(); | 837 DeviceSettingsService::Shutdown(); |
830 } | 838 } |
831 | 839 |
832 } // namespace chromeos | 840 } // namespace chromeos |
OLD | NEW |