| Index: chrome/browser/devtools/devtools_window.h
|
| diff --git a/chrome/browser/devtools/devtools_window.h b/chrome/browser/devtools/devtools_window.h
|
| index 181ed3e318a48b8730aa8ba58a6bee98700e659b..37a89bcc16cfd61e14abef497d2911f25f8d4371 100644
|
| --- a/chrome/browser/devtools/devtools_window.h
|
| +++ b/chrome/browser/devtools/devtools_window.h
|
| @@ -21,7 +21,6 @@
|
| #include "content/public/browser/notification_observer.h"
|
| #include "content/public/browser/notification_registrar.h"
|
| #include "content/public/browser/web_contents_delegate.h"
|
| -#include "ui/gfx/insets.h"
|
| #include "ui/gfx/size.h"
|
|
|
| class Browser;
|
| @@ -123,9 +122,9 @@ class DevToolsWindow : private content::NotificationObserver,
|
| content::RenderViewHost* GetRenderViewHost();
|
|
|
| // Inspected WebContents is placed over DevTools WebContents in docked mode.
|
| - // The following methods return the insets of inspected WebContents
|
| - // relative to DevTools WebContents.
|
| - gfx::Insets GetContentsInsets() const;
|
| + // The The following method returns the resizing strategy of inspected
|
| + // WebContents relative to DevTools WebContents.
|
| + const DevToolsContentsResizingStrategy& GetContentsResizingStrategy() const;
|
|
|
| // Minimum size of the docked DevTools WebContents. This includes
|
| // the overlaying inspected WebContents size.
|
| @@ -301,6 +300,8 @@ class DevToolsWindow : private content::NotificationObserver,
|
| virtual void CloseWindow() OVERRIDE;
|
| virtual void SetContentsInsets(
|
| int left, int top, int right, int bottom) OVERRIDE;
|
| + virtual void SetContentsResizingStrategy(
|
| + const DevToolsContentsResizingStrategy& strategy) OVERRIDE;
|
| virtual void MoveWindow(int x, int y) OVERRIDE;
|
| virtual void SetIsDocked(bool is_docked) OVERRIDE;
|
| virtual void OpenInNewTab(const std::string& url) OVERRIDE;
|
| @@ -381,7 +382,7 @@ class DevToolsWindow : private content::NotificationObserver,
|
| scoped_refptr<DevToolsFileSystemIndexer::FileSystemIndexingJob> >
|
| IndexingJobsMap;
|
| IndexingJobsMap indexing_jobs_;
|
| - gfx::Insets contents_insets_;
|
| + DevToolsContentsResizingStrategy contents_resizing_strategy_;
|
| // True if we're in the process of handling a beforeunload event originating
|
| // from the inspected webcontents, see InterceptPageBeforeUnload for details.
|
| bool intercepted_page_beforeunload_;
|
|
|