Merge 53562 - The scrollability of a bookmark menu should be reconsidered whe...

chrome/browser/cocoa/bookmark_bar_folder_controller.mm

 // Copyright (c) 2010 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.
 
 #import "chrome/browser/cocoa/bookmark_bar_folder_controller.h"
 #include "base/mac_util.h"
 #include "base/nsimage_cache_mac.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
@@ skipping 374 matching lines @@
   NSRect mainViewFrame = NSMakeRect(0, 0,
                                     NSWidth(windowFrame) -
                                     bookmarks::kScrollViewContentWidthMargin,
                                     NSHeight(windowFrame));
   [mainView_ setFrame:mainViewFrame];
 
   // Make sure the window fits on the screen.  If not, constrain.
   // We'll scroll to allow the user to see all the content.
   NSRect screenFrame = [[[self window] screen] frame];
   screenFrame = NSInsetRect(screenFrame, 0, kScrollWindowVerticalMargin);
+  BOOL wasScrollable = scrollable_;
   if (!NSContainsRect(screenFrame, windowFrame)) {
     scrollable_ = YES;
     windowFrame = NSIntersectionRect(screenFrame, windowFrame);
   } else {
     scrollable_ = NO;
   }
-  [[self window] setFrame:windowFrame display:YES];
+  NSWindow* window = [self window];
+  [window setFrame:windowFrame display:YES];
   // If scrollable then offset the view and show the arrows.
-  if (scrollable_) {
+  if (wasScrollable != scrollable_) {
     [mainView_ scrollPoint:NSMakePoint(0, (NSHeight(mainViewFrame) -
                                            NSHeight(windowFrame)))];
     [self showOrHideScrollArrows];
     [self addOrUpdateScrollTracking];
   }
 }
 
 // Determine window size and position.
 // Create buttons for all our nodes.
 // TODO(jrg): break up into more and smaller routines for easier unit testing.
@@ skipping 960 matching lines @@
   return [folderController_ controllerForNode:node];
 }
 
 #pragma mark TestingAPI Only
 
 - (void)setIgnoreAnimations:(BOOL)ignore {
   ignoreAnimations_ = ignore;
 }
 
 @end  // BookmarkBarFolderController