Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(970)

Unified Diff: chrome/browser/tab_contents/tab_contents.cc

Issue 6413014: Original patch from issue 570048 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: a few fixes Created 9 years, 10 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
Index: chrome/browser/tab_contents/tab_contents.cc
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index 2f946be16bb945a3a29a5caff2461bab3e7b1847..6fa9968d09194330dc8cefc10d278c5dcdc72f61 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -1448,6 +1448,14 @@ void TabContents::UpdateHistoryPageTitle(const NavigationEntry& entry) {
hs->SetPageTitle(entry.virtual_url(), entry.title());
}
+int TabContents::SetZoomLevel(double zoom_level) {
+ static int request_id = -1;
+
+ ++request_id;
Aaron Boodman 2011/02/07 09:26:55 Chromium style forbids post-increment.
+ render_view_host()->SetZoomLevel(request_id, zoom_level);
+ return request_id;
+}
+
double TabContents::GetZoomLevel() const {
HostZoomMap* zoom_map = profile()->GetHostZoomMap();
if (!zoom_map)
@@ -1463,11 +1471,17 @@ double TabContents::GetZoomLevel() const {
return zoom_level;
}
-int TabContents::GetZoomPercent(bool* enable_increment,
+int TabContents::SetZoomPercent(double zoom_percent) {
+ double zoom_level;
+ zoom_level = WebKit::WebView::zoomFactorToZoomLevel(zoom_percent / 100);
+ return SetZoomLevel(zoom_level);
+}
+
+double TabContents::GetZoomPercent(bool* enable_increment,
bool* enable_decrement) {
*enable_decrement = *enable_increment = false;
- int percent = static_cast<int>(
- WebKit::WebView::zoomLevelToZoomFactor(GetZoomLevel()) * 100);
+ double percent = 0.0;
+ percent = WebKit::WebView::zoomLevelToZoomFactor(GetZoomLevel()) * 100;
*enable_decrement = percent > minimum_zoom_percent_;
*enable_increment = percent < maximum_zoom_percent_;
return percent;
@@ -1898,7 +1912,7 @@ void TabContents::UpdateWebPreferences() {
}
void TabContents::UpdateZoomLevel() {
- render_view_host()->SetZoomLevel(GetZoomLevel());
+ SetZoomLevel(GetZoomLevel());
}
void TabContents::UpdateMaxPageIDIfNecessary(SiteInstance* site_instance,

Powered by Google App Engine
This is Rietveld 408576698