| Index: chrome/browser/ui/app_list/app_list_controller_delegate.cc
|
| diff --git a/chrome/browser/ui/app_list/app_list_controller_delegate.cc b/chrome/browser/ui/app_list/app_list_controller_delegate.cc
|
| index ff9703ef7f5796591b9e4e685007127ed950731d..536f182e2b51c3295c426aa329dcd738838e783a 100644
|
| --- a/chrome/browser/ui/app_list/app_list_controller_delegate.cc
|
| +++ b/chrome/browser/ui/app_list/app_list_controller_delegate.cc
|
| @@ -22,6 +22,7 @@
|
| #include "extensions/browser/management_policy.h"
|
| #include "extensions/common/extension.h"
|
| #include "extensions/common/extension_set.h"
|
| +#include "extensions/common/manifest_handlers/options_page_info.h"
|
| #include "net/base/url_util.h"
|
| #include "ui/app_list/app_list_folder_item.h"
|
| #include "ui/app_list/app_list_item.h"
|
| @@ -158,7 +159,7 @@ bool AppListControllerDelegate::HasOptionsPage(
|
| const extensions::Extension* extension = GetExtension(profile, app_id);
|
| return extensions::util::IsAppLaunchableWithoutEnabling(app_id, profile) &&
|
| extension &&
|
| - !extensions::ManifestURL::GetOptionsPage(extension).is_empty();
|
| + !extensions::OptionsPageInfo::GetOptionsPage(extension).is_empty();
|
| }
|
|
|
| void AppListControllerDelegate::ShowOptionsPage(
|
| @@ -170,7 +171,7 @@ void AppListControllerDelegate::ShowOptionsPage(
|
|
|
| chrome::NavigateParams params(
|
| profile,
|
| - extensions::ManifestURL::GetOptionsPage(extension),
|
| + extensions::OptionsPageInfo::GetOptionsPage(extension),
|
| content::PAGE_TRANSITION_LINK);
|
| chrome::Navigate(¶ms);
|
| }
|
|
|