Index: content/browser/web_contents/web_contents_impl.cc |
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc |
index a2bdcb134cb86b2e2ebce697c20e809c1f1876e0..521e88cf2b7c74a9f18885a796510851d32b1725 100644 |
--- a/content/browser/web_contents/web_contents_impl.cc |
+++ b/content/browser/web_contents/web_contents_impl.cc |
@@ -338,7 +338,6 @@ WebContentsImpl::WebContentsImpl( |
closed_by_user_gesture_(false), |
minimum_zoom_percent_(static_cast<int>(kMinimumZoomFactor * 100)), |
maximum_zoom_percent_(static_cast<int>(kMaximumZoomFactor * 100)), |
- temporary_zoom_settings_(false), |
totalPinchGestureAmount_(0), |
currentPinchZoomStepDelta_(0), |
render_view_message_source_(NULL), |
@@ -2140,35 +2139,13 @@ bool WebContentsImpl::GetClosedByUserGesture() const { |
return closed_by_user_gesture_; |
} |
-double WebContentsImpl::GetZoomLevel() const { |
- HostZoomMapImpl* zoom_map = static_cast<HostZoomMapImpl*>( |
- HostZoomMap::GetForBrowserContext(GetBrowserContext())); |
- if (!zoom_map) |
- return 0; |
- |
- double zoom_level; |
- if (temporary_zoom_settings_) { |
- zoom_level = zoom_map->GetTemporaryZoomLevel( |
- GetRenderProcessHost()->GetID(), GetRenderViewHost()->GetRoutingID()); |
- } else { |
- GURL url; |
- NavigationEntry* entry = GetController().GetLastCommittedEntry(); |
- // Since zoom map is updated using rewritten URL, use rewritten URL |
- // to get the zoom level. |
- url = entry ? entry->GetURL() : GURL::EmptyGURL(); |
- zoom_level = zoom_map->GetZoomLevelForHostAndScheme(url.scheme(), |
- net::GetHostOrSpecFromURL(url)); |
- } |
- return zoom_level; |
-} |
- |
int WebContentsImpl::GetZoomPercent(bool* enable_increment, |
bool* enable_decrement) const { |
*enable_decrement = *enable_increment = false; |
// Calculate the zoom percent from the factor. Round up to the nearest whole |
// number. |
int percent = static_cast<int>( |
- ZoomLevelToZoomFactor(GetZoomLevel()) * 100 + 0.5); |
+ ZoomLevelToZoomFactor(HostZoomMap::GetZoomLevel(this)) * 100 + 0.5); |
*enable_decrement = percent > minimum_zoom_percent_; |
*enable_increment = percent < maximum_zoom_percent_; |
return percent; |
@@ -2257,13 +2234,6 @@ bool WebContentsImpl::IsSubframe() const { |
return is_subframe_; |
} |
-void WebContentsImpl::SetZoomLevel(double level) { |
- Send(new ViewMsg_SetZoomLevel(GetRoutingID(), level)); |
- BrowserPluginEmbedder* embedder = GetBrowserPluginEmbedder(); |
- if (embedder) |
- embedder->SetZoomLevel(level); |
-} |
- |
void WebContentsImpl::Find(int request_id, |
const base::string16& search_text, |
const blink::WebFindOptions& options) { |
@@ -2693,11 +2663,9 @@ void WebContentsImpl::OnGoToEntryAtOffset(int offset) { |
} |
void WebContentsImpl::OnUpdateZoomLimits(int minimum_percent, |
- int maximum_percent, |
- bool remember) { |
+ int maximum_percent) { |
minimum_zoom_percent_ = minimum_percent; |
maximum_zoom_percent_ = maximum_percent; |
- temporary_zoom_settings_ = !remember; |
} |
void WebContentsImpl::OnEnumerateDirectory(int request_id, |