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

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

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 | « chrome/browser/ui/cocoa/browser_window_controller.mm ('k') | content/browser/tab_contents/tab_contents.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/tab_contents/tab_contents.h
diff --git a/content/browser/tab_contents/tab_contents.h b/content/browser/tab_contents/tab_contents.h
index 6585c7a80af720e51a7c89ad1560ed2aaa52e4c1..36239bbfdf88432ef43ae2657d192da8a08a18f0 100644
--- a/content/browser/tab_contents/tab_contents.h
+++ b/content/browser/tab_contents/tab_contents.h
@@ -24,6 +24,7 @@
#include "content/public/browser/web_contents.h"
#include "content/public/common/renderer_preferences.h"
#include "net/base/load_states.h"
+#include "ui/gfx/size.h"
#include "webkit/glue/resource_type.h"
#if defined(OS_WIN)
@@ -203,6 +204,7 @@ class CONTENT_EXPORT TabContents
const std::string& content_state) OVERRIDE;
virtual int GetMinimumZoomPercent() const OVERRIDE;
virtual int GetMaximumZoomPercent() const OVERRIDE;
+ virtual gfx::Size GetPreferredSize() const OVERRIDE;
virtual int GetContentRestrictions() const OVERRIDE;
virtual WebUI::TypeID GetWebUITypeForCurrentState() OVERRIDE;
virtual WebUI* GetWebUIForCurrentState() OVERRIDE;
@@ -628,6 +630,9 @@ class CONTENT_EXPORT TabContents
// remember it.
bool temporary_zoom_settings_;
+ // The intrinsic size of the page.
+ gfx::Size preferred_size_;
+
// Content restrictions, used to disable print/copy etc based on content's
// (full-page plugins for now only) permissions.
int content_restrictions_;
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_controller.mm ('k') | content/browser/tab_contents/tab_contents.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698