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

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

Issue 9215002: Fix window zoom in a sane way, remove nasty casts. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: style Created 8 years, 11 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
« no previous file with comments | « content/browser/tab_contents/tab_contents.h ('k') | content/public/browser/web_contents.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/tab_contents/tab_contents.cc
diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc
index b2aec156db51eaf75c350ea58ce42fa3bd3067d2..8ea6a1facb30cb548397c06dbc1b69311fcef063 100644
--- a/content/browser/tab_contents/tab_contents.cc
+++ b/content/browser/tab_contents/tab_contents.cc
@@ -764,6 +764,7 @@ void TabContents::LostMouseLock() {
}
void TabContents::UpdatePreferredSize(const gfx::Size& pref_size) {
+ preferred_size_ = pref_size;
if (delegate_)
delegate_->UpdatePreferredSize(this, pref_size);
}
@@ -1059,6 +1060,10 @@ int TabContents::GetMaximumZoomPercent() const {
return maximum_zoom_percent_;
}
+gfx::Size TabContents::GetPreferredSize() const {
+ return preferred_size_;
+}
+
int TabContents::GetContentRestrictions() const {
return content_restrictions_;
}
« no previous file with comments | « content/browser/tab_contents/tab_contents.h ('k') | content/public/browser/web_contents.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698