| Index: chrome/browser/ui/webui/options/content_settings_handler.cc
|
| diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc
|
| index 04cee719745d92b50d807b7ceaea09b59b934a49..7b0aaef11393044b0b7c792185385eda4913b0a2 100644
|
| --- a/chrome/browser/ui/webui/options/content_settings_handler.cc
|
| +++ b/chrome/browser/ui/webui/options/content_settings_handler.cc
|
| @@ -28,6 +28,7 @@
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/content_settings.h"
|
| #include "chrome/common/content_settings_pattern.h"
|
| +#include "chrome/common/extensions/app_launcher_info.h"
|
| #include "chrome/common/extensions/extension_set.h"
|
| #include "chrome/common/extensions/permissions/api_permission.h"
|
| #include "chrome/common/pref_names.h"
|
| @@ -228,7 +229,8 @@ void AddExceptionsGrantedByHostedApps(
|
| AddExceptionForHostedApp(url_pattern, **extension, exceptions);
|
| }
|
| // Retrieve the launch URL.
|
| - std::string launch_url_string = (*extension)->launch_web_url();
|
| + std::string launch_url_string =
|
| + extensions::AppLauncherInfo::GetLaunchWebURL(*extension);
|
| GURL launch_url(launch_url_string);
|
| // Skip adding the launch URL if it is part of the web extent.
|
| if (web_extent.MatchesURL(launch_url)) continue;
|
|
|