| Index: chrome/browser/extensions/extension_function.h
|
| diff --git a/chrome/browser/extensions/extension_function.h b/chrome/browser/extensions/extension_function.h
|
| index b595fb598c00d0af0718847d48ecf5a92bb377a6..45c73260107c0d335177f00993859b5f0caeed13 100644
|
| --- a/chrome/browser/extensions/extension_function.h
|
| +++ b/chrome/browser/extensions/extension_function.h
|
| @@ -31,13 +31,16 @@ class UIThreadExtensionFunction;
|
| class IOThreadExtensionFunction;
|
| class Profile;
|
| class QuotaLimitHeuristic;
|
| -class RenderViewHost;
|
|
|
| namespace base {
|
| class ListValue;
|
| class Value;
|
| }
|
|
|
| +namespace content {
|
| +class RenderViewHost;
|
| +}
|
| +
|
| #define EXTENSION_FUNCTION_VALIDATE(test) do { \
|
| if (!(test)) { \
|
| bad_message_ = true; \
|
| @@ -237,8 +240,10 @@ class UIThreadExtensionFunction : public ExtensionFunction {
|
| void set_profile(Profile* profile) { profile_ = profile; }
|
| Profile* profile() const { return profile_; }
|
|
|
| - void SetRenderViewHost(RenderViewHost* render_view_host);
|
| - RenderViewHost* render_view_host() const { return render_view_host_; }
|
| + void SetRenderViewHost(content::RenderViewHost* render_view_host);
|
| + content::RenderViewHost* render_view_host() const {
|
| + return render_view_host_;
|
| + }
|
|
|
| void set_dispatcher(
|
| const base::WeakPtr<ExtensionFunctionDispatcher>& dispatcher) {
|
| @@ -279,7 +284,7 @@ class UIThreadExtensionFunction : public ExtensionFunction {
|
| base::WeakPtr<ExtensionFunctionDispatcher> dispatcher_;
|
|
|
| // The RenderViewHost we will send responses too.
|
| - RenderViewHost* render_view_host_;
|
| + content::RenderViewHost* render_view_host_;
|
|
|
| // The Profile of this function's extension.
|
| Profile* profile_;
|
| @@ -296,14 +301,14 @@ class UIThreadExtensionFunction : public ExtensionFunction {
|
| public content::RenderViewHostObserver {
|
| public:
|
| RenderViewHostTracker(UIThreadExtensionFunction* function,
|
| - RenderViewHost* render_view_host);
|
| + content::RenderViewHost* render_view_host);
|
| private:
|
| virtual void Observe(int type,
|
| const content::NotificationSource& source,
|
| const content::NotificationDetails& details) OVERRIDE;
|
|
|
| virtual void RenderViewHostDestroyed(
|
| - RenderViewHost* render_view_host) OVERRIDE;
|
| + content::RenderViewHost* render_view_host) OVERRIDE;
|
| virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
|
|
|
| UIThreadExtensionFunction* function_;
|
|
|