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

chrome/browser/tab_contents/tab_contents_view_mac.h

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_MAC_H_
 #define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_MAC_H_
 #pragma once
 
 #if defined(__OBJC__)
 
 #import <Cocoa/Cocoa.h>
@@ skipping 101 matching lines @@
   virtual void UpdateDragCursor(WebKit::WebDragOperation operation) OVERRIDE;
   virtual void GotFocus() OVERRIDE;
   virtual void TakeFocus(bool reverse) OVERRIDE;
 
   // A helper method for closing the tab in the
   // CloseTabAfterEventTracking() implementation.
   void CloseTab();
 
   TabContents* tab_contents() { return tab_contents_; }
   int preferred_width() const { return preferred_width_; }
+  void set_preferred_width(int preferred_width) {
+    preferred_width_ = preferred_width;
+  }
 
  private:
   // The TabContents whose contents we display.
   TabContents* tab_contents_;
 
   // Common implementations of some RenderViewHostDelegate::View methods.
   RenderViewHostDelegateViewHelper delegate_view_helper_;
 
   // The Cocoa NSView that lives in the view hierarchy.
   scoped_nsobject<TabContentsViewCocoa> cocoa_view_;
@@ skipping 19 matching lines @@
 
 // Functions that may be accessed from non-Objective-C C/C++ code.
 class TabContents;
 class TabContentsView;
 
 namespace tab_contents_view_mac {
 TabContentsView* CreateTabContentsView(TabContents* tab_contents);
 }
 
 #endif  // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_MAC_H_