chrome/browser/chromeos/chrome_browser_main_chromeos.cc - Issue 1413153007: arc-app-launcher: Minimal support for ARC app launcher.

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 1413153007: arc-app-launcher: Minimal support for ARC app launcher. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: nit: fix typo in header, rename test lib to test_support Created 5 years, 1 month 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

« no previous file with comments | « chrome/browser/chromeos/chrome_browser_main_chromeos.h ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | chrome/browser/ui/app_list/arc_app_icon.cc » ('J')
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 08bc59e3a02b9e7958d2e0e11147f04513f0d721..d09ea8dee2d6ff943d0fe69cd57868de9bd18867 100644

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

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

@@ -145,7 +145,7 @@

#endif

#if defined(ENABLE_ARC)

-#include "components/arc/arc_bridge_service.h"

+#include "components/arc/arc_bridge_service_impl.h"

#endif

namespace chromeos {

@@ -391,7 +391,7 @@ void ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun() {

wake_on_wifi_manager_.reset(new WakeOnWifiManager());

#if defined(ENABLE_ARC)

- arc_bridge_service_.reset(new arc::ArcBridgeService(

+ arc_bridge_service_.reset(new arc::ArcBridgeServiceImpl(

content::BrowserThread::GetMessageLoopProxyForThread(

content::BrowserThread::IO),

content::BrowserThread::GetMessageLoopProxyForThread(