chrome/browser/extensions/api/feedback_private/feedback_private_api.cc - Issue 2507073002: Split ArcSessionManager from ArcAuthService.

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/extensions/api/feedback_private/feedback_private_api.cc

Issue 2507073002: Split ArcSessionManager from ArcAuthService. (Closed)

Patch Set: Fix rebase mistake Created 4 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/policy/device_status_collector_browsertest.cc ('k') | chrome/browser/metrics/chromeos_metrics_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/feedback_private/feedback_private_api.cc

diff --git a/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc b/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc

index 58a93349b3c26eb23468e6823cb59745ade7045b..10fdd04d3fd17bc5e712cedad514f285422830e2 100644

--- a/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc

+++ b/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc

@@ -33,7 +33,7 @@

#include "url/url_util.h"

#if defined(OS_CHROMEOS)

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

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

#endif // defined(OS_CHROMEOS)

#if defined(OS_WIN)

@@ -164,8 +164,9 @@ ExtensionFunction::ResponseAction FeedbackPrivateGetStringsFunction::Run() {

SET_STRING("screenshot", IDS_FEEDBACK_SCREENSHOT_LABEL);

SET_STRING("user-email", IDS_FEEDBACK_USER_EMAIL_LABEL);

#if defined(OS_CHROMEOS)

- const arc::ArcAuthService* auth_service = arc::ArcAuthService::Get();

- if (auth_service && auth_service->IsArcEnabled()) {

+ const arc::ArcSessionManager* arc_session_manager =

+ arc::ArcSessionManager::Get();

+ if (arc_session_manager && arc_session_manager->IsArcEnabled()) {

SET_STRING("sys-info",

IDS_FEEDBACK_INCLUDE_SYSTEM_INFORMATION_AND_METRICS_CHKBOX_ARC);

} else {