| Index: chrome/renderer/extensions/extension_helper.cc
|
| diff --git a/chrome/renderer/extensions/extension_helper.cc b/chrome/renderer/extensions/extension_helper.cc
|
| index 69249b1189bfd05e5673fd14a316df341d44fd01..6d9cf1f4854d4dea7b713ec2729275bbdd4ecf47 100644
|
| --- a/chrome/renderer/extensions/extension_helper.cc
|
| +++ b/chrome/renderer/extensions/extension_helper.cc
|
| @@ -13,8 +13,8 @@
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/extensions/api/messaging/message.h"
|
| +#include "chrome/common/extensions/chrome_extension_messages.h"
|
| #include "chrome/common/extensions/extension_constants.h"
|
| -#include "chrome/common/extensions/extension_messages.h"
|
| #include "chrome/common/render_messages.h"
|
| #include "chrome/common/url_constants.h"
|
| #include "chrome/renderer/extensions/chrome_v8_context.h"
|
| @@ -27,6 +27,7 @@
|
| #include "content/public/renderer/render_view.h"
|
| #include "content/public/renderer/render_view_visitor.h"
|
| #include "extensions/common/constants.h"
|
| +#include "extensions/common/extension_messages.h"
|
| #include "third_party/WebKit/public/platform/WebURLRequest.h"
|
| #include "third_party/WebKit/public/web/WebConsoleMessage.h"
|
| #include "third_party/WebKit/public/web/WebDocument.h"
|
| @@ -162,7 +163,8 @@ bool ExtensionHelper::OnMessageReceived(const IPC::Message& message) {
|
| IPC_MESSAGE_HANDLER(ExtensionMsg_DispatchOnDisconnect,
|
| OnExtensionDispatchOnDisconnect)
|
| IPC_MESSAGE_HANDLER(ExtensionMsg_ExecuteCode, OnExecuteCode)
|
| - IPC_MESSAGE_HANDLER(ExtensionMsg_GetApplicationInfo, OnGetApplicationInfo)
|
| + IPC_MESSAGE_HANDLER(ChromeExtensionMsg_GetApplicationInfo,
|
| + OnGetApplicationInfo)
|
| IPC_MESSAGE_HANDLER(ExtensionMsg_SetTabId, OnSetTabId)
|
| IPC_MESSAGE_HANDLER(ExtensionMsg_UpdateBrowserWindowId,
|
| OnUpdateBrowserWindowId)
|
| @@ -340,7 +342,7 @@ void ExtensionHelper::OnGetApplicationInfo(int page_id) {
|
| }
|
| }
|
|
|
| - Send(new ExtensionHostMsg_DidGetApplicationInfo(
|
| + Send(new ChromeExtensionHostMsg_DidGetApplicationInfo(
|
| routing_id(), page_id, app_info));
|
| }
|
|
|
|
|