Add a stack-based class for property disabling and re-enabling screen updatin...

chrome/browser/cocoa/browser_window_controller.mm

 // Copyright (c) 2009 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.
 
 #include "base/mac_util.h"
+#include "base/scoped_nsdisable_screen_updates.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"  // IDC_*
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/encoding_menu_controller.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #import "chrome/browser/cocoa/bookmark_bar_controller.h"
@@ skipping 170 matching lines @@
 }
 
 // Called when the user wants to close a window or from the shutdown process.
 // The Browser object is in control of whether or not we're allowed to close. It
 // may defer closing due to several states, such as onUnload handlers needing to
 // be fired. If closing is deferred, the Browser will handle the processing
 // required to get us to the closing state and (by watching for all the tabs
 // going away) will again call to close the window when it's finally ready.
 - (BOOL)windowShouldClose:(id)sender {
   // Disable updates while closing all tabs to avoid flickering.
-  NSDisableScreenUpdates();
+  base::ScopedNSDisableScreenUpdates disabler;
   // Give beforeunload handlers the chance to cancel the close before we hide
   // the window below.
   if (!browser_->ShouldCloseWindow())
     return NO;
 
   // saveWindowPositionIfNeeded: only works if we are the last active
   // window, but orderOut: ends up activating another window, so we
   // have to save the window position before we call orderOut:.
   [self saveWindowPositionIfNeeded];
 
   if (!browser_->tabstrip_model()->empty()) {
     // Tab strip isn't empty.  Hide the frame (so it appears to have closed
     // immediately) and close all the tabs, allowing the renderers to shut
     // down. When the tab strip is empty we'll be called back again.
     [[self window] orderOut:self];
     browser_->OnWindowClosing();
     return NO;
   }
-  NSEnableScreenUpdates();
 
   // the tab strip is empty, it's ok to close the window
   return YES;
 }
 
 // Called right after our window became the main window.
 - (void)windowDidBecomeMain:(NSNotification *)notification {
   BrowserList::SetLastActive(browser_.get());
   [self saveWindowPositionIfNeeded];
 }
@@ skipping 229 matching lines @@
 - (void)focusLocationBar {
   [toolbarController_ focusLocationBar];
 }
 
 - (void)layoutTabs {
   [tabStripController_ layoutTabs];
 }
 
 - (TabWindowController*)detachTabToNewWindow:(TabView*)tabView {
   // Disable screen updates so that this appears as a single visual change.
-  NSDisableScreenUpdates();
+  base::ScopedNSDisableScreenUpdates disabler;
 
   // Fetch the tab contents for the tab being dragged
   int index = [tabStripController_ indexForTabView:tabView];
   TabContents* contents = browser_->tabstrip_model()->GetTabContentsAt(index);
 
   // Set the window size. Need to do this before we detach the tab so it's
   // still in the window. We have to flip the coordinates as that's what
   // is expected by the Browser code.
   NSWindow* sourceWindow = [tabView window];
   NSRect windowRect = [sourceWindow frame];
@@ skipping 24 matching lines @@
   BrowserWindowController* controller =
       [newBrowser->window()->GetNativeHandle() delegate];
   DCHECK(controller && [controller isKindOfClass:[TabWindowController class]]);
 
   // Force the added tab to the right size (remove stretching.)
   tabRect.size.height = [TabStripController defaultTabHeight];
 
   // And make sure we use the correct frame in the new view.
   [[controller tabStripController] setFrameOfSelectedTab:tabRect];
 
-  NSEnableScreenUpdates();
   return controller;
 }
 
 
 - (void)insertPlaceholderForTab:(TabView*)tab
                           frame:(NSRect)frame
                       yStretchiness:(CGFloat)yStretchiness {
   [tabStripController_ insertPlaceholderForTab:tab
                                          frame:frame
                                  yStretchiness:yStretchiness];
@@ skipping 203 matching lines @@
   else if ([event deltaY] < -0.5)
     ;  // TODO(pinkerton): figure out page-down
 
   // Ensure the command is valid first (ExecuteCommand() won't do that) and
   // then make it so.
   if (browser_->command_updater()->IsCommandEnabled(command))
     browser_->ExecuteCommand(command);
 }
 
 @end