Merge 83125 - Add and use gfx::ScopedNSGraphicsContextState (ui/gfx/scoped_ns_graphics_context_st...

chrome/browser/ui/cocoa/browser_window_controller.mm

Index: chrome/browser/ui/cocoa/browser_window_controller.mm
===================================================================
--- chrome/browser/ui/cocoa/browser_window_controller.mm	(revision 84308)
+++ chrome/browser/ui/cocoa/browser_window_controller.mm	(working copy)
@@ -63,6 +63,7 @@
 #include "grit/locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
+#include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 
 
 // ORGANIZATION: This is a big file. It is (in principle) organized as follows
@@ -188,7 +189,7 @@
 }
 
 - (void)drawRect:(NSRect)rect {
-  [NSGraphicsContext saveGraphicsState];
+  gfx::ScopedNSGraphicsContextSaveGState scopedGState;
 
   scoped_nsobject<NSShadow> shadow([[NSShadow alloc] init]);
   [shadow.get() setShadowColor:[NSColor colorWithCalibratedWhite:0.0
@@ -202,7 +203,6 @@
                  operation:NSCompositeSourceOver
                   fraction:1.0
               neverFlipped:YES];
-  [NSGraphicsContext restoreGraphicsState];
 }
 
 - (void)setImage:(NSImage*)image {