Chromium Code Reviews| 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 12 matching lines...) Expand all Loading... | |
| 23 #include "base/task_runner_util.h" | 23 #include "base/task_runner_util.h" |
| 24 #include "chrome/browser/browser_process.h" | 24 #include "chrome/browser/browser_process.h" |
| 25 #include "chrome/browser/browser_process_platform_part_chromeos.h" | 25 #include "chrome/browser/browser_process_platform_part_chromeos.h" |
| 26 #include "chrome/browser/chrome_notification_types.h" | 26 #include "chrome/browser/chrome_notification_types.h" |
| 27 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" | 27 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" |
| 28 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" | 28 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" |
| 29 #include "chrome/browser/chromeos/accessibility/spoken_feedback_event_rewriter.h " | 29 #include "chrome/browser/chromeos/accessibility/spoken_feedback_event_rewriter.h " |
| 30 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h" | 30 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h" |
| 31 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" | 31 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" |
| 32 #include "chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification .h" | 32 #include "chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification .h" |
| 33 #include "chrome/browser/chromeos/arc/notification/arc_notification_manager.h" | |
| 33 #include "chrome/browser/chromeos/boot_times_recorder.h" | 34 #include "chrome/browser/chromeos/boot_times_recorder.h" |
| 34 #include "chrome/browser/chromeos/dbus/chrome_console_service_provider_delegate. h" | 35 #include "chrome/browser/chromeos/dbus/chrome_console_service_provider_delegate. h" |
| 35 #include "chrome/browser/chromeos/dbus/chrome_display_power_service_provider_del egate.h" | 36 #include "chrome/browser/chromeos/dbus/chrome_display_power_service_provider_del egate.h" |
| 36 #include "chrome/browser/chromeos/dbus/chrome_proxy_resolver_delegate.h" | 37 #include "chrome/browser/chromeos/dbus/chrome_proxy_resolver_delegate.h" |
| 37 #include "chrome/browser/chromeos/dbus/screen_lock_service_provider.h" | 38 #include "chrome/browser/chromeos/dbus/screen_lock_service_provider.h" |
| 38 #include "chrome/browser/chromeos/events/event_rewriter.h" | 39 #include "chrome/browser/chromeos/events/event_rewriter.h" |
| 39 #include "chrome/browser/chromeos/events/event_rewriter_controller.h" | 40 #include "chrome/browser/chromeos/events/event_rewriter_controller.h" |
| 40 #include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h" | 41 #include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h" |
| 41 #include "chrome/browser/chromeos/extensions/default_app_order.h" | 42 #include "chrome/browser/chromeos/extensions/default_app_order.h" |
| 42 #include "chrome/browser/chromeos/external_metrics.h" | 43 #include "chrome/browser/chromeos/external_metrics.h" |
| (...skipping 592 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 635 new RendererFreezer(scoped_ptr<RendererFreezer::Delegate>( | 636 new RendererFreezer(scoped_ptr<RendererFreezer::Delegate>( |
| 636 new FreezerCgroupProcessManager()))); | 637 new FreezerCgroupProcessManager()))); |
| 637 | 638 |
| 638 g_browser_process->platform_part()->InitializeAutomaticRebootManager(); | 639 g_browser_process->platform_part()->InitializeAutomaticRebootManager(); |
| 639 g_browser_process->platform_part()->InitializeDeviceDisablingManager(); | 640 g_browser_process->platform_part()->InitializeDeviceDisablingManager(); |
| 640 | 641 |
| 641 // This observer cannot be created earlier because it requires the shell to be | 642 // This observer cannot be created earlier because it requires the shell to be |
| 642 // available. | 643 // available. |
| 643 idle_action_warning_observer_.reset(new IdleActionWarningObserver()); | 644 idle_action_warning_observer_.reset(new IdleActionWarningObserver()); |
| 644 | 645 |
| 646 if (arc::ArcBridgeService::GetEnabled( | |
| 647 base::CommandLine::ForCurrentProcess())) { | |
| 648 DCHECK(arc_bridge_service_); | |
| 649 arc_notification_manager_.reset( | |
| 650 new ArcNotificationManager(arc_bridge_service_.get(), profile())); | |
|
elijahtaylor1
2015/12/09 06:41:26
is the main reason ArcNotificationManager lives in
yoshiki
2015/12/09 17:11:09
Currently notification needs Profile to determine
| |
| 651 } | |
| 652 | |
| 645 ChromeBrowserMainPartsLinux::PostProfileInit(); | 653 ChromeBrowserMainPartsLinux::PostProfileInit(); |
| 646 } | 654 } |
| 647 | 655 |
| 648 void ChromeBrowserMainPartsChromeos::PreBrowserStart() { | 656 void ChromeBrowserMainPartsChromeos::PreBrowserStart() { |
| 649 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() | 657 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() |
| 650 // -- just before MetricsService::LogNeedForCleanShutdown(). | 658 // -- just before MetricsService::LogNeedForCleanShutdown(). |
| 651 | 659 |
| 652 // Start the external metrics service, which collects metrics from Chrome OS | 660 // Start the external metrics service, which collects metrics from Chrome OS |
| 653 // and passes them to the browser process. | 661 // and passes them to the browser process. |
| 654 external_metrics_ = new chromeos::ExternalMetrics; | 662 external_metrics_ = new chromeos::ExternalMetrics; |
| (...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 824 // Destroy DBus services immediately after threads are stopped. | 832 // Destroy DBus services immediately after threads are stopped. |
| 825 dbus_services_.reset(); | 833 dbus_services_.reset(); |
| 826 | 834 |
| 827 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 835 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
| 828 | 836 |
| 829 // Destroy DeviceSettingsService after g_browser_process. | 837 // Destroy DeviceSettingsService after g_browser_process. |
| 830 DeviceSettingsService::Shutdown(); | 838 DeviceSettingsService::Shutdown(); |
| 831 } | 839 } |
| 832 | 840 |
| 833 } // namespace chromeos | 841 } // namespace chromeos |
| OLD | NEW |