| Index: content/browser/web_contents/web_contents_impl.h
|
| diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
|
| index 35da9b59954e69259bacf2aa09a8a59c8a5d9a06..af28e0c026d522470c8940bc23eae1391063741d 100644
|
| --- a/content/browser/web_contents/web_contents_impl.h
|
| +++ b/content/browser/web_contents/web_contents_impl.h
|
| @@ -350,7 +350,7 @@ class CONTENT_EXPORT WebContentsImpl
|
| void ViewFrameSource(const GURL& url, const PageState& page_state) override;
|
| int GetMinimumZoomPercent() const override;
|
| int GetMaximumZoomPercent() const override;
|
| - void ResetPageScale() override;
|
| + void SetPageScale(float page_scale_factor) override;
|
| gfx::Size GetPreferredSize() const override;
|
| bool GotResponseToLockMouseRequest(bool allowed) override;
|
| bool HasOpener() const override;
|
| @@ -832,6 +832,7 @@ class CONTENT_EXPORT WebContentsImpl
|
| void OnGoToEntryAtOffset(int offset);
|
| void OnUpdateZoomLimits(int minimum_percent,
|
| int maximum_percent);
|
| + void OnPageScaleFactorChanged(float page_scale_factor);
|
| void OnEnumerateDirectory(int request_id, const base::FilePath& path);
|
|
|
| void OnRegisterProtocolHandler(const std::string& protocol,
|
| @@ -1312,6 +1313,8 @@ class CONTENT_EXPORT WebContentsImpl
|
|
|
| PageImportanceSignals page_importance_signals_;
|
|
|
| + bool page_scale_factor_is_one_;
|
| +
|
| base::WeakPtrFactory<WebContentsImpl> loading_weak_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
|
|
|