summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/cocoa/browser_window_cocoa.mm
diff options
context:
space:
mode:
authorjianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-11 19:37:34 +0000
committerjianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-11 19:37:34 +0000
commit695f90acfbb5131ac0ca669ce1c9d29678554df1 (patch)
tree81dedfb38d7acaa135e71cabda774ad848e6f615 /chrome/browser/ui/cocoa/browser_window_cocoa.mm
parente2212a11039994a1acc3527631398f620e0ba032 (diff)
downloadchromium_src-695f90acfbb5131ac0ca669ce1c9d29678554df1.zip
chromium_src-695f90acfbb5131ac0ca669ce1c9d29678554df1.tar.gz
chromium_src-695f90acfbb5131ac0ca669ce1c9d29678554df1.tar.bz2
Fix bug 104170: [Mac OS] Best-fit-window-zoom doesn't work anymore
BUG=104170 TEST=Manual test by following repro steps in the bug Review URL: http://codereview.chromium.org/9158026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117260 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/cocoa/browser_window_cocoa.mm')
-rw-r--r--chrome/browser/ui/cocoa/browser_window_cocoa.mm7
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
index 84eebef..c23cf56 100644
--- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm
+++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
@@ -14,6 +14,7 @@
#include "chrome/browser/download/download_shelf.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/tab_contents/tab_contents_view_mac.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_list.h"
#import "chrome/browser/ui/cocoa/browser/avatar_button_controller.h"
@@ -603,6 +604,12 @@ NSWindow* BrowserWindowCocoa::window() const {
return [controller_ window];
}
+void BrowserWindowCocoa::UpdatePreferredSize(content::WebContents* web_contents,
+ const gfx::Size& pref_size) {
+ static_cast<TabContentsViewMac*>(web_contents->GetView())->
+ set_preferred_width(pref_size.width());
+}
+
void BrowserWindowCocoa::ShowAvatarBubble(WebContents* web_contents,
const gfx::Rect& rect) {
NSView* view = web_contents->GetNativeView();