content/browser/web_contents/web_contents_impl.h - Issue 287093002: Remove ViewMsg_SetZoomLevel

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/web_contents/web_contents_impl.h

Issue 287093002: Remove ViewMsg_SetZoomLevel (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Re-order functions, add comments and DCHECK(). Created 6 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« content/browser/host_zoom_map_impl.cc ('K') | « content/browser/renderer_host/render_view_host_impl.cc ('k') | content/browser/web_contents/web_contents_impl.cc » ('j') | content/common/view_messages.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 8278efbefb179207529d871450e75c25602ab472..7f28c06df2a37595fff99347f96e899a1ad31d8d 100644

--- a/content/browser/web_contents/web_contents_impl.h

+++ b/content/browser/web_contents/web_contents_impl.h

@@ -278,7 +278,6 @@ class CONTENT_EXPORT WebContentsImpl

virtual void UserGestureDone() OVERRIDE;

virtual void SetClosedByUserGesture(bool value) OVERRIDE;

virtual bool GetClosedByUserGesture() const OVERRIDE;

- virtual double GetZoomLevel() const OVERRIDE;

virtual int GetZoomPercent(bool* enable_increment,

bool* enable_decrement) const OVERRIDE;

virtual void ViewSource() OVERRIDE;

@@ -299,7 +298,6 @@ class CONTENT_EXPORT WebContentsImpl

virtual void Find(int request_id,

const base::string16& search_text,

const blink::WebFindOptions& options) OVERRIDE;

- virtual void SetZoomLevel(double level) OVERRIDE;

virtual void StopFinding(StopFindAction action) OVERRIDE;

virtual void InsertCSS(const std::string& css) OVERRIDE;

#if defined(OS_ANDROID)

@@ -706,8 +704,7 @@ class CONTENT_EXPORT WebContentsImpl

void OnDidChangeLoadProgress(double load_progress);

void OnGoToEntryAtOffset(int offset);

void OnUpdateZoomLimits(int minimum_percent,

- int maximum_percent,

- bool remember);

+ int maximum_percent);

void OnEnumerateDirectory(int request_id, const base::FilePath& path);

void OnRegisterProtocolHandler(const std::string& protocol,

@@ -1044,10 +1041,6 @@ class CONTENT_EXPORT WebContentsImpl

// Minimum/maximum zoom percent.

int minimum_zoom_percent_;

int maximum_zoom_percent_;

- // If true, the default zoom limits have been overriden for this tab, in which

- // case we don't want saved settings to apply to it and we don't want to

- // remember it.

- bool temporary_zoom_settings_;

// The raw accumulated zoom value and the actual zoom increments made for an

// an in-progress pinch gesture.