chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views.cc - Issue 2702723002: Extract kArcEnabled preference from ArcSessionManager part 1.

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/ui/views/apps/app_info_dialog/app_info_dialog_views.cc

Issue 2702723002: Extract kArcEnabled preference from ArcSessionManager part 1. (Closed)

Patch Set: Address comments. Created 3 years, 10 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

« no previous file with comments | « chrome/browser/ui/ash/launcher/launcher_controller_helper.cc ('k') | chrome/browser/ui/views/arc_app_dialog_view_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views.cc

diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views.cc b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views.cc

index cf4114cadc97a562273a2f44cb55b488c1cfd9e3..0dece36c0139322b9e8df9e2271a2b0e16969563 100644

--- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views.cc

+++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views.cc

@@ -34,7 +34,7 @@

#include "ui/views/window/dialog_delegate.h"

#if defined(OS_CHROMEOS)

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

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

#include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"

#include "chrome/browser/ui/app_list/arc/arc_app_utils.h"

#include "chrome/browser/ui/views/apps/app_info_dialog/arc_app_info_links_panel.h"

@@ -143,10 +143,10 @@ AppInfoDialog::AppInfoDialog(gfx::NativeWindow parent_window,

dialog_body_contents->AddChildView(new AppInfoPermissionsPanel(profile, app));

#if defined(OS_CHROMEOS)

- // When ARC is enabled and the Settings app is available, show the

- // "Manage supported links" link for Chrome.

+ // When Google Play Store is enabled and the Settings app is available, show

+ // the "Manage supported links" link for Chrome.

if (app->id() == extension_misc::kChromeAppId &&

- arc::ArcSessionManager::Get()->IsArcPlayStoreEnabled()) {

+ arc::IsArcPlayStoreEnabledForProfile(profile)) {

const ArcAppListPrefs* arc_app_list_prefs = ArcAppListPrefs::Get(profile);

if (arc_app_list_prefs &&

arc_app_list_prefs->IsRegistered(arc::kSettingsAppId)) {