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

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

Issue 1475583002: Add IPC messages for ARC notification (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 391
391 wake_on_wifi_manager_.reset(new WakeOnWifiManager()); 392 wake_on_wifi_manager_.reset(new WakeOnWifiManager());
392 393
393 #if defined(ENABLE_ARC) 394 #if defined(ENABLE_ARC)
394 arc_bridge_service_.reset(new arc::ArcBridgeService( 395 arc_bridge_service_.reset(new arc::ArcBridgeService(
395 content::BrowserThread::GetMessageLoopProxyForThread( 396 content::BrowserThread::GetMessageLoopProxyForThread(
396 content::BrowserThread::IO), 397 content::BrowserThread::IO),
397 content::BrowserThread::GetMessageLoopProxyForThread( 398 content::BrowserThread::GetMessageLoopProxyForThread(
398 content::BrowserThread::FILE))); 399 content::BrowserThread::FILE)));
399 arc_bridge_service_->DetectAvailability(); 400 arc_bridge_service_->DetectAvailability();
401
402 arc_notification_manager_.reset(new ArcNotificationManager());
khmel1 2015/11/25 00:30:10 Would it be better to pass ArcBridgeService in CTO
yoshiki 2015/11/25 09:40:35 Done.
400 #endif 403 #endif
401 404
402 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); 405 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun();
403 } 406 }
404 407
405 void ChromeBrowserMainPartsChromeos::PreProfileInit() { 408 void ChromeBrowserMainPartsChromeos::PreProfileInit() {
406 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() 409 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun()
407 // -- immediately before Profile creation(). 410 // -- immediately before Profile creation().
408 411
409 // Now that the file thread exists we can record our stats. 412 // Now that the file thread exists we can record our stats.
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after
825 // Destroy DBus services immediately after threads are stopped. 828 // Destroy DBus services immediately after threads are stopped.
826 dbus_services_.reset(); 829 dbus_services_.reset();
827 830
828 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 831 ChromeBrowserMainPartsLinux::PostDestroyThreads();
829 832
830 // Destroy DeviceSettingsService after g_browser_process. 833 // Destroy DeviceSettingsService after g_browser_process.
831 DeviceSettingsService::Shutdown(); 834 DeviceSettingsService::Shutdown();
832 } 835 }
833 836
834 } // namespace chromeos 837 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698