Chromium Code Reviews| 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 7f7ea24619ae45be0542bffd15b51440074b6181..88b77d1e58dfa0c25b1381ab50709c9427c2325f 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 |
| @@ -18,6 +18,7 @@ |
| #include "chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.h" |
| #include "chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_panel.h" |
| #include "chrome/common/chrome_switches.h" |
| +#include "chrome/common/extensions/extension_constants.h" |
| #include "components/constrained_window/constrained_window_views.h" |
| #include "content/public/browser/web_contents.h" |
| #include "extensions/browser/extension_registry.h" |
| @@ -32,6 +33,11 @@ |
| #include "ui/views/widget/widget.h" |
| #include "ui/views/window/dialog_delegate.h" |
| +#if defined(OS_CHROMEOS) |
| +#include "chrome/browser/chromeos/arc/arc_auth_service.h" |
| +#include "chrome/browser/ui/views/apps/app_info_dialog/arc_app_info_links_panel.h" |
| +#endif |
| + |
| namespace { |
| // The color of the separator used inside the dialog - should match the app |
| @@ -153,6 +159,14 @@ AppInfoDialog::AppInfoDialog(gfx::NativeWindow parent_window, |
| dialog_body_contents->AddChildView(new AppInfoSummaryPanel(profile, app)); |
| dialog_body_contents->AddChildView(new AppInfoPermissionsPanel(profile, app)); |
| +#if defined(OS_CHROMEOS) |
| + // When ARC is enabled, show the "Manage supported links" link for Chrome. |
| + if (arc::ArcAuthService::Get()->IsArcEnabled() && |
| + app->id() == extension_misc::kChromeAppId) { |
|
Peter Kasting
2016/06/23 07:07:20
Nit: {} optional
mtomasz
2016/06/23 08:51:56
Done.
|
| + dialog_body_contents->AddChildView(new ArcAppInfoLinksPanel(profile, app)); |
| + } |
| +#endif |
| + |
| // Clip the scrollable view so that the scrollbar appears. As long as this |
| // is larger than the height of the dialog, it will be resized to the dialog's |
| // actual height. |