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

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

Issue 1607603005: Revert of Host-side implementation of ARC Intent handler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
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 <stddef.h> 7 #include <stddef.h>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 16 matching lines...) Expand all
27 #include "chrome/browser/browser_process.h" 27 #include "chrome/browser/browser_process.h"
28 #include "chrome/browser/browser_process_platform_part_chromeos.h" 28 #include "chrome/browser/browser_process_platform_part_chromeos.h"
29 #include "chrome/browser/chrome_notification_types.h" 29 #include "chrome/browser/chrome_notification_types.h"
30 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 30 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
31 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" 31 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
32 #include "chrome/browser/chromeos/accessibility/spoken_feedback_event_rewriter.h " 32 #include "chrome/browser/chromeos/accessibility/spoken_feedback_event_rewriter.h "
33 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h" 33 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h"
34 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" 34 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
35 #include "chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification .h" 35 #include "chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification .h"
36 #include "chrome/browser/chromeos/arc/arc_auth_service_impl.h" 36 #include "chrome/browser/chromeos/arc/arc_auth_service_impl.h"
37 #include "chrome/browser/chromeos/arc/arc_intent_helper_bridge_impl.h"
38 #include "chrome/browser/chromeos/arc/arc_settings_bridge_impl.h" 37 #include "chrome/browser/chromeos/arc/arc_settings_bridge_impl.h"
39 #include "chrome/browser/chromeos/boot_times_recorder.h" 38 #include "chrome/browser/chromeos/boot_times_recorder.h"
40 #include "chrome/browser/chromeos/dbus/chrome_console_service_provider_delegate. h" 39 #include "chrome/browser/chromeos/dbus/chrome_console_service_provider_delegate. h"
41 #include "chrome/browser/chromeos/dbus/chrome_display_power_service_provider_del egate.h" 40 #include "chrome/browser/chromeos/dbus/chrome_display_power_service_provider_del egate.h"
42 #include "chrome/browser/chromeos/dbus/chrome_proxy_resolver_delegate.h" 41 #include "chrome/browser/chromeos/dbus/chrome_proxy_resolver_delegate.h"
43 #include "chrome/browser/chromeos/dbus/screen_lock_service_provider.h" 42 #include "chrome/browser/chromeos/dbus/screen_lock_service_provider.h"
44 #include "chrome/browser/chromeos/events/event_rewriter.h" 43 #include "chrome/browser/chromeos/events/event_rewriter.h"
45 #include "chrome/browser/chromeos/events/event_rewriter_controller.h" 44 #include "chrome/browser/chromeos/events/event_rewriter_controller.h"
46 #include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h" 45 #include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h"
47 #include "chrome/browser/chromeos/extensions/default_app_order.h" 46 #include "chrome/browser/chromeos/extensions/default_app_order.h"
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 393
395 base::FilePath downloads_directory; 394 base::FilePath downloads_directory;
396 CHECK(PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_directory)); 395 CHECK(PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_directory));
397 396
398 DeviceOAuth2TokenServiceFactory::Initialize(); 397 DeviceOAuth2TokenServiceFactory::Initialize();
399 398
400 wake_on_wifi_manager_.reset(new WakeOnWifiManager()); 399 wake_on_wifi_manager_.reset(new WakeOnWifiManager());
401 400
402 arc_service_manager_.reset(new arc::ArcServiceManager( 401 arc_service_manager_.reset(new arc::ArcServiceManager(
403 make_scoped_ptr(new arc::ArcAuthServiceImpl()), 402 make_scoped_ptr(new arc::ArcAuthServiceImpl()),
404 make_scoped_ptr(new arc::ArcIntentHelperBridgeImpl()),
405 make_scoped_ptr(new arc::ArcSettingsBridgeImpl()), 403 make_scoped_ptr(new arc::ArcSettingsBridgeImpl()),
406 make_scoped_ptr( 404 make_scoped_ptr(
407 new arc::ArcVideoBridge(content::CreateArcVideoHostDelegate())))); 405 new arc::ArcVideoBridge(content::CreateArcVideoHostDelegate()))));
408 arc_service_manager_->arc_bridge_service()->DetectAvailability(); 406 arc_service_manager_->arc_bridge_service()->DetectAvailability();
409 407
410 chromeos::ResourceReporter::GetInstance()->StartMonitoring(); 408 chromeos::ResourceReporter::GetInstance()->StartMonitoring();
411 409
412 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); 410 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun();
413 } 411 }
414 412
(...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after
835 // Destroy DBus services immediately after threads are stopped. 833 // Destroy DBus services immediately after threads are stopped.
836 dbus_services_.reset(); 834 dbus_services_.reset();
837 835
838 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 836 ChromeBrowserMainPartsLinux::PostDestroyThreads();
839 837
840 // Destroy DeviceSettingsService after g_browser_process. 838 // Destroy DeviceSettingsService after g_browser_process.
841 DeviceSettingsService::Shutdown(); 839 DeviceSettingsService::Shutdown();
842 } 840 }
843 841
844 } // namespace chromeos 842 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/arc/arc_intent_helper_bridge_impl.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698