| Index: chrome/renderer/extensions/extension_helper.h
|
| ===================================================================
|
| --- chrome/renderer/extensions/extension_helper.h (revision 138369)
|
| +++ chrome/renderer/extensions/extension_helper.h (working copy)
|
| @@ -11,9 +11,9 @@
|
|
|
| #include "base/memory/linked_ptr.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "chrome/common/view_type.h"
|
| #include "content/public/renderer/render_view_observer.h"
|
| #include "content/public/renderer/render_view_observer_tracker.h"
|
| -#include "content/public/common/view_type.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLResponse.h"
|
|
|
| class ExtensionDispatcher;
|
| @@ -42,7 +42,7 @@
|
| static std::vector<content::RenderView*> GetExtensionViews(
|
| const std::string& extension_id,
|
| int browser_window_id,
|
| - content::ViewType view_type);
|
| + chrome::ViewType view_type);
|
|
|
| // Returns the given extension's background page, or NULL if none.
|
| static content::RenderView* GetBackgroundPage(
|
| @@ -60,7 +60,7 @@
|
| string16* error);
|
|
|
| int browser_window_id() const { return browser_window_id_; }
|
| - content::ViewType view_type() const { return view_type_; }
|
| + chrome::ViewType view_type() const { return view_type_; }
|
|
|
| private:
|
| // RenderViewObserver implementation.
|
| @@ -91,7 +91,7 @@
|
| void OnExtensionDispatchOnDisconnect(int port_id, bool connection_error);
|
| void OnExecuteCode(const ExtensionMsg_ExecuteCode_Params& params);
|
| void OnGetApplicationInfo(int page_id);
|
| - void OnNotifyRendererViewType(content::ViewType view_type);
|
| + void OnNotifyRendererViewType(chrome::ViewType view_type);
|
| void OnUpdateBrowserWindowId(int window_id);
|
|
|
| // Callback triggered when we finish downloading the application definition
|
| @@ -127,7 +127,7 @@
|
| int pending_app_icon_requests_;
|
|
|
| // Type of view attached with RenderView.
|
| - content::ViewType view_type_;
|
| + chrome::ViewType view_type_;
|
|
|
| // Id number of browser window which RenderView is attached to.
|
| int browser_window_id_;
|
|
|