| Index: extensions/browser/app_window/app_window_contents.h
|
| diff --git a/extensions/browser/app_window/app_window_contents.h b/extensions/browser/app_window/app_window_contents.h
|
| index 2a3d905beca08fcce0d0a56774394f7feaa85d12..b9e6fce0862c4c7ab92f189030b6f47f3ca9765a 100644
|
| --- a/extensions/browser/app_window/app_window_contents.h
|
| +++ b/extensions/browser/app_window/app_window_contents.h
|
| @@ -19,8 +19,6 @@ class BrowserContext;
|
|
|
| namespace extensions {
|
|
|
| -struct DraggableRegion;
|
| -
|
| // AppWindowContents class specific to app windows. It maintains a
|
| // WebContents instance and observes it for the purpose of passing
|
| // messages to the extensions system.
|
| @@ -35,7 +33,8 @@ class AppWindowContentsImpl : public AppWindowContents,
|
| virtual void Initialize(content::BrowserContext* context,
|
| const GURL& url) OVERRIDE;
|
| virtual void LoadContents(int32 creator_process_id) OVERRIDE;
|
| - virtual void NativeWindowChanged(NativeAppWindow* native_app_window) OVERRIDE;
|
| + virtual void NativeWindowChanged(
|
| + native_app_window::NativeAppWindow* native_app_window) OVERRIDE;
|
| virtual void NativeWindowClosed() OVERRIDE;
|
| virtual void DispatchWindowShownForTests() const OVERRIDE;
|
| virtual content::WebContents* GetWebContents() const OVERRIDE;
|
| @@ -49,7 +48,8 @@ class AppWindowContentsImpl : public AppWindowContents,
|
| virtual content::WebContents* GetAssociatedWebContents() const OVERRIDE;
|
|
|
| void OnRequest(const ExtensionHostMsg_Request_Params& params);
|
| - void UpdateDraggableRegions(const std::vector<DraggableRegion>& regions);
|
| + void UpdateDraggableRegions(
|
| + const std::vector<native_app_window::DraggableRegion>& regions);
|
| void SuspendRenderViewHost(content::RenderViewHost* rvh);
|
|
|
| AppWindow* host_; // This class is owned by |host_|
|
|
|