chrome/browser/chromeos/chrome_browser_main_chromeos.cc - Issue 1610813003: Merge arc/common/settings.mojom into intent_helper.mojom

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 1610813003: Merge arc/common/settings.mojom into intent_helper.mojom (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 side-by-side diff with in-line comments

Download patch

« chrome/browser/chromeos/arc/settings_bridge.cc ('K') | « chrome/browser/chromeos/arc/settings_bridge_unittest.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc

index 23a96a32e1efe432fbc48c8c23f81615769b3b7c..f7ff0d22ef811505b18ee4eddd75f6d90de712ce 100644

--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc

+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc

@@ -35,7 +35,6 @@

#include "chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.h"

#include "chrome/browser/chromeos/arc/arc_auth_service_impl.h"

#include "chrome/browser/chromeos/arc/arc_intent_helper_bridge_impl.h"

-#include "chrome/browser/chromeos/arc/arc_settings_bridge_impl.h"

#include "chrome/browser/chromeos/boot_times_recorder.h"

#include "chrome/browser/chromeos/dbus/chrome_console_service_provider_delegate.h"

#include "chrome/browser/chromeos/dbus/chrome_display_power_service_provider_delegate.h"

@@ -117,7 +116,6 @@

#include "chromeos/tpm/tpm_token_loader.h"

#include "components/arc/arc_bridge_service.h"

#include "components/arc/arc_service_manager.h"

-#include "components/arc/settings/arc_settings_bridge.h"

#include "components/arc/video/arc_video_bridge.h"

#include "components/arc/video/video_host_delegate.h"

#include "components/browser_sync/common/browser_sync_switches.h"

@@ -402,7 +400,6 @@ void ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun() {

arc_service_manager_.reset(new arc::ArcServiceManager(

make_scoped_ptr(new arc::ArcAuthServiceImpl()),

make_scoped_ptr(new arc::ArcIntentHelperBridgeImpl()),

- make_scoped_ptr(new arc::ArcSettingsBridgeImpl()),

make_scoped_ptr(

new arc::ArcVideoBridge(content::CreateArcVideoHostDelegate()))));

arc_service_manager_->arc_bridge_service()->DetectAvailability();