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

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

Issue 1477733002: Add ArcNotificationManager for new ARC notification (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add a TODO comment about ArcServiceManager Created 5 years 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 12 matching lines...) Expand all
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 588 matching lines...) Expand 10 before | Expand all | Expand 10 after
631 new RendererFreezer(scoped_ptr<RendererFreezer::Delegate>( 632 new RendererFreezer(scoped_ptr<RendererFreezer::Delegate>(
632 new FreezerCgroupProcessManager()))); 633 new FreezerCgroupProcessManager())));
633 634
634 g_browser_process->platform_part()->InitializeAutomaticRebootManager(); 635 g_browser_process->platform_part()->InitializeAutomaticRebootManager();
635 g_browser_process->platform_part()->InitializeDeviceDisablingManager(); 636 g_browser_process->platform_part()->InitializeDeviceDisablingManager();
636 637
637 // This observer cannot be created earlier because it requires the shell to be 638 // This observer cannot be created earlier because it requires the shell to be
638 // available. 639 // available.
639 idle_action_warning_observer_.reset(new IdleActionWarningObserver()); 640 idle_action_warning_observer_.reset(new IdleActionWarningObserver());
640 641
642 // TODO(yoshiki): Make the ArcNotificationManager instance managed by
643 // ArcServiceManager, when it can manage a service under C/B/chromeos.
644 if (arc::ArcBridgeService::GetEnabled(
645 base::CommandLine::ForCurrentProcess())) {
646 DCHECK(arc_service_manager_);
647 arc_notification_manager_.reset(new ArcNotificationManager(
648 arc_service_manager_->arc_bridge_service(), profile()));
649 }
650
641 ChromeBrowserMainPartsLinux::PostProfileInit(); 651 ChromeBrowserMainPartsLinux::PostProfileInit();
642 } 652 }
643 653
644 void ChromeBrowserMainPartsChromeos::PreBrowserStart() { 654 void ChromeBrowserMainPartsChromeos::PreBrowserStart() {
645 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() 655 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun()
646 // -- just before MetricsService::LogNeedForCleanShutdown(). 656 // -- just before MetricsService::LogNeedForCleanShutdown().
647 657
648 // Start the external metrics service, which collects metrics from Chrome OS 658 // Start the external metrics service, which collects metrics from Chrome OS
649 // and passes them to the browser process. 659 // and passes them to the browser process.
650 external_metrics_ = new chromeos::ExternalMetrics; 660 external_metrics_ = new chromeos::ExternalMetrics;
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
820 // Destroy DBus services immediately after threads are stopped. 830 // Destroy DBus services immediately after threads are stopped.
821 dbus_services_.reset(); 831 dbus_services_.reset();
822 832
823 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 833 ChromeBrowserMainPartsLinux::PostDestroyThreads();
824 834
825 // Destroy DeviceSettingsService after g_browser_process. 835 // Destroy DeviceSettingsService after g_browser_process.
826 DeviceSettingsService::Shutdown(); 836 DeviceSettingsService::Shutdown();
827 } 837 }
828 838
829 } // namespace chromeos 839 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698