| Index: chrome/renderer/extensions/extension_localization_peer.h
|
| diff --git a/chrome/renderer/extensions/extension_localization_peer.h b/chrome/renderer/extensions/extension_localization_peer.h
|
| index 78aab0c9dcef0471f9736f37c6cbaa3b7d83eb14..b4db0ba46bc2dbd75fa170383e5f9dbbcfeaa601 100644
|
| --- a/chrome/renderer/extensions/extension_localization_peer.h
|
| +++ b/chrome/renderer/extensions/extension_localization_peer.h
|
| @@ -7,23 +7,22 @@
|
|
|
| #include <string>
|
|
|
| +#include "content/public/child/resource_loader_bridge.h"
|
| #include "ipc/ipc_sender.h"
|
| -#include "webkit/child/resource_loader_bridge.h"
|
|
|
| // The ExtensionLocalizationPeer is a proxy to a
|
| -// webkit_glue::ResourceLoaderBridge::Peer instance. It is used to pre-process
|
| +// content::ResourceLoaderBridge::Peer instance. It is used to pre-process
|
| // CSS files requested by extensions to replace localization templates with the
|
| // appropriate localized strings.
|
| //
|
| // Call the factory method CreateExtensionLocalizationPeer() to obtain an
|
| // instance of ExtensionLocalizationPeer based on the original Peer.
|
| -class ExtensionLocalizationPeer
|
| - : public webkit_glue::ResourceLoaderBridge::Peer {
|
| +class ExtensionLocalizationPeer : public content::ResourceLoaderBridge::Peer {
|
| public:
|
| virtual ~ExtensionLocalizationPeer();
|
|
|
| static ExtensionLocalizationPeer* CreateExtensionLocalizationPeer(
|
| - webkit_glue::ResourceLoaderBridge::Peer* peer,
|
| + content::ResourceLoaderBridge::Peer* peer,
|
| IPC::Sender* message_sender,
|
| const std::string& mime_type,
|
| const GURL& request_url);
|
| @@ -53,17 +52,16 @@ class ExtensionLocalizationPeer
|
| friend class ExtensionLocalizationPeerTest;
|
|
|
| // Use CreateExtensionLocalizationPeer to create an instance.
|
| - ExtensionLocalizationPeer(
|
| - webkit_glue::ResourceLoaderBridge::Peer* peer,
|
| - IPC::Sender* message_sender,
|
| - const GURL& request_url);
|
| + ExtensionLocalizationPeer(content::ResourceLoaderBridge::Peer* peer,
|
| + IPC::Sender* message_sender,
|
| + const GURL& request_url);
|
|
|
| // Loads message catalogs, and replaces all __MSG_some_name__ templates within
|
| // loaded file.
|
| void ReplaceMessages();
|
|
|
| // Original peer that handles the request once we are done processing data_.
|
| - webkit_glue::ResourceLoaderBridge::Peer* original_peer_;
|
| + content::ResourceLoaderBridge::Peer* original_peer_;
|
|
|
| // We just pass though the response info. This holds the copy of the original.
|
| webkit_glue::ResourceResponseInfo response_info_;
|
|
|