| Index: extensions/browser/suggest_permission_util.cc
|
| diff --git a/extensions/browser/suggest_permission_util.cc b/extensions/browser/suggest_permission_util.cc
|
| index 85bf4fff86e1ec054d73816bda31f01593de2624..93006a82df86d1714ab616a1d49e319377e1d61c 100644
|
| --- a/extensions/browser/suggest_permission_util.cc
|
| +++ b/extensions/browser/suggest_permission_util.cc
|
| @@ -4,15 +4,15 @@
|
|
|
| #include "extensions/browser/suggest_permission_util.h"
|
|
|
| -#include "content/public/browser/render_view_host.h"
|
| +#include "base/strings/stringprintf.h"
|
| +#include "content/public/browser/render_frame_host.h"
|
| +#include "content/public/browser/web_contents.h"
|
| #include "content/public/common/console_message_level.h"
|
| #include "extensions/common/extension.h"
|
| -#include "extensions/common/extension_messages.h"
|
| #include "extensions/common/permissions/permissions_data.h"
|
| #include "extensions/common/permissions/permissions_info.h"
|
|
|
| using content::CONSOLE_MESSAGE_LEVEL_WARNING;
|
| -using content::RenderViewHost;
|
|
|
| namespace extensions {
|
|
|
| @@ -25,10 +25,7 @@ const char kPermissionsHelpURLForApps[] =
|
|
|
| void SuggestAPIPermissionInDevToolsConsole(APIPermission::ID permission,
|
| const Extension* extension,
|
| - content::RenderViewHost* host) {
|
| - if (!extension || !host)
|
| - return;
|
| -
|
| + content::WebContents* contents) {
|
| const APIPermissionInfo* permission_info =
|
| PermissionsInfo::GetInstance()->GetByID(permission);
|
| CHECK(permission_info);
|
| @@ -41,8 +38,8 @@ void SuggestAPIPermissionInDevToolsConsole(APIPermission::ID permission,
|
| extension->is_platform_app() ?
|
| kPermissionsHelpURLForApps : kPermissionsHelpURLForExtensions);
|
|
|
| - host->Send(new ExtensionMsg_AddMessageToConsole(
|
| - host->GetRoutingID(), CONSOLE_MESSAGE_LEVEL_WARNING, message));
|
| + contents->GetMainFrame()->AddMessageToConsole(CONSOLE_MESSAGE_LEVEL_WARNING,
|
| + message);
|
| }
|
|
|
| } // namespace
|
| @@ -50,12 +47,12 @@ void SuggestAPIPermissionInDevToolsConsole(APIPermission::ID permission,
|
| bool IsExtensionWithPermissionOrSuggestInConsole(
|
| APIPermission::ID permission,
|
| const Extension* extension,
|
| - content::RenderViewHost* host) {
|
| + content::WebContents* web_contents) {
|
| if (extension && extension->permissions_data()->HasAPIPermission(permission))
|
| return true;
|
|
|
| - if (extension)
|
| - SuggestAPIPermissionInDevToolsConsole(permission, extension, host);
|
| + if (extension && web_contents)
|
| + SuggestAPIPermissionInDevToolsConsole(permission, extension, web_contents);
|
|
|
| return false;
|
| }
|
|
|