chrome/browser/chromeos/login/session/restore_after_crash_session_manager_delegate.cc - Issue 2165643004: arc: add enterprise_reporting.mojom interface.

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/login/session/restore_after_crash_session_manager_delegate.cc

Issue 2165643004: arc: add enterprise_reporting.mojom interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed crash error. Created 4 years, 5 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/arc_user_data_service.cc ('K') | « chrome/browser/chromeos/arc/arc_user_data_service.cc ('k') | chrome/browser/chromeos/login/session/user_session_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/session/restore_after_crash_session_manager_delegate.cc

diff --git a/chrome/browser/chromeos/login/session/restore_after_crash_session_manager_delegate.cc b/chrome/browser/chromeos/login/session/restore_after_crash_session_manager_delegate.cc

index a3ae19f22987a780d665e7aab5e2eb7c746e0041..96649b5476043c5b5cd5825c8ce6d44410aba6b7 100644

--- a/chrome/browser/chromeos/login/session/restore_after_crash_session_manager_delegate.cc

+++ b/chrome/browser/chromeos/login/session/restore_after_crash_session_manager_delegate.cc

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

#include "base/command_line.h"

#include "chrome/browser/chrome_notification_types.h"

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

+#include "chrome/browser/chromeos/arc/arc_user_data_service.h"

#include "chrome/browser/chromeos/login/session/user_session_manager.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/ui/ash/multi_user/multi_user_util.h"

@@ -63,8 +64,11 @@ void RestoreAfterCrashSessionManagerDelegate::Start() {

base::MakeUnique<BooleanPrefMember>();

arc_enabled_pref->Init(prefs::kArcEnabled, profile()->GetPrefs());

arc::ArcServiceManager::Get()->OnPrimaryUserProfilePrepared(

- multi_user_util::GetAccountIdFromProfile(profile()),

- std::move(arc_enabled_pref));

+ multi_user_util::GetAccountIdFromProfile(profile()));

+ arc::ArcServiceManager::Get()->AddService(

+ base::WrapUnique(new arc::ArcUserDataService(

+ arc::ArcBridgeService::Get(), std::move(arc_enabled_pref),

+ multi_user_util::GetAccountIdFromProfile(profile()))));

DCHECK(arc::ArcAuthService::Get());

arc::ArcAuthService::Get()->OnPrimaryUserProfilePrepared(profile());

}