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

chrome/browser/tab_contents/tab_contents_view_mac.h

Index: chrome/browser/tab_contents/tab_contents_view_mac.h
===================================================================
--- chrome/browser/tab_contents/tab_contents_view_mac.h	(revision 117570)
+++ chrome/browser/tab_contents/tab_contents_view_mac.h	(working copy)
@@ -1,4 +1,4 @@
-// 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.
 
@@ -120,6 +120,9 @@
 
   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.
Property changes on: chrome\browser\tab_contents\tab_contents_view_mac.h
___________________________________________________________________
Deleted: svn:mergeinfo