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

chrome/browser/ui/cocoa/browser_window_controller.mm

 // Copyright (c) 2011 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/ui/cocoa/browser_window_controller.h"
 
 #include <Carbon/Carbon.h>
 
 #include "app/mac/scoped_nsdisable_screen_updates.h"
 #include "app/mac/nsimage_cache.h"
@@ skipping 45 matching lines @@
 #include "chrome/browser/ui/tabs/dock_info.h"
 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h"
 #include "chrome/browser/ui/window_sizer.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "grit/generated_resources.h"
 #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
 // (in order):
 // 1. Interfaces. Very short, one-time-use classes may include an implementation
 //    immediately after their interface.
 // 2. The general implementation section, ordered as follows:
 //      i. Public methods and overrides.
 //     ii. Overrides/implementations of undocumented methods.
 //    iii. Delegate methods for various protocols, formal and informal, to which
@@ skipping 105 matching lines @@
 
 @end
 
 @implementation IncognitoImageView
 
 - (BOOL)mouseDownCanMoveWindow {
   return YES;
 }
 
 - (void)drawRect:(NSRect)rect {
-  [NSGraphicsContext saveGraphicsState];
+  gfx::ScopedNSGraphicsContextSaveGState scopedGState;
 
   scoped_nsobject<NSShadow> shadow([[NSShadow alloc] init]);
   [shadow.get() setShadowColor:[NSColor colorWithCalibratedWhite:0.0
                                                            alpha:0.75]];
   [shadow.get() setShadowOffset:NSMakeSize(0, 0)];
   [shadow.get() setShadowBlurRadius:3.0];
   [shadow.get() set];
 
   [image_.get() drawInRect:[self bounds]
                   fromRect:NSZeroRect
                  operation:NSCompositeSourceOver
                   fraction:1.0
               neverFlipped:YES];
-  [NSGraphicsContext restoreGraphicsState];
 }
 
 - (void)setImage:(NSImage*)image {
   image_.reset([image retain]);
 }
 
 @end
 
 
 @implementation BrowserWindowController
@@ skipping 1969 matching lines @@
 
 - (BOOL)supportsBookmarkBar {
   return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
 }
 
 - (BOOL)isNormalWindow {
   return browser_->type() == Browser::TYPE_NORMAL;
 }
 
 @end  // @implementation BrowserWindowController(WindowType)