Merge 117260 - Fix bug 104170: [Mac OS] Best-fit-window-zoom doesn't work anymore

chrome/browser/ui/cocoa/browser_window_cocoa.mm

Index: chrome/browser/ui/cocoa/browser_window_cocoa.mm
===================================================================
--- chrome/browser/ui/cocoa/browser_window_cocoa.mm	(revision 117570)
+++ chrome/browser/ui/cocoa/browser_window_cocoa.mm	(working copy)
@@ -16,6 +16,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sidebar/sidebar_container.h"
 #include "chrome/browser/sidebar/sidebar_manager.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"
@@ -637,3 +638,9 @@
 void BrowserWindowCocoa::ShowAvatarBubbleFromAvatarButton() {
   [[controller_ avatarButtonController] showAvatarBubble];
 }
+
+void BrowserWindowCocoa::UpdatePreferredSize(TabContents* tab_contents,
+                                             const gfx::Size& pref_size) {
+  static_cast<TabContentsViewMac*>(tab_contents->view())->
+      set_preferred_width(pref_size.width());
+}