Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(116)

Side by Side Diff: chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_window.mm

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: iwyu, scoped_nsprotocol Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_wi ndow.h" 5 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_wi ndow.h"
6 6
7 #import "base/memory/scoped_nsobject.h" 7 #import "base/mac/scoped_nsobject.h"
8 #import "chrome/browser/ui/chrome_style.h" 8 #import "chrome/browser/ui/chrome_style.h"
9 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_con troller.h" 9 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_con troller.h"
10 #include "skia/ext/skia_utils_mac.h" 10 #include "skia/ext/skia_utils_mac.h"
11 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" 11 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
12 12
13 @implementation ConstrainedWindowCustomWindow 13 @implementation ConstrainedWindowCustomWindow
14 14
15 - (id)initWithContentRect:(NSRect)contentRect { 15 - (id)initWithContentRect:(NSRect)contentRect {
16 if ((self = [self initWithContentRect:contentRect 16 if ((self = [self initWithContentRect:contentRect
17 styleMask:NSBorderlessWindowMask 17 styleMask:NSBorderlessWindowMask
18 backing:NSBackingStoreBuffered 18 backing:NSBackingStoreBuffered
19 defer:NO])) { 19 defer:NO])) {
20 scoped_nsobject<NSView> contentView( 20 base::scoped_nsobject<NSView> contentView(
21 [[ConstrainedWindowCustomWindowContentView alloc] 21 [[ConstrainedWindowCustomWindowContentView alloc]
22 initWithFrame:NSZeroRect]); 22 initWithFrame:NSZeroRect]);
23 [self setContentView:contentView]; 23 [self setContentView:contentView];
24 } 24 }
25 return self; 25 return self;
26 } 26 }
27 27
28 - (id)initWithContentRect:(NSRect)contentRect 28 - (id)initWithContentRect:(NSRect)contentRect
29 styleMask:(NSUInteger)windowStyle 29 styleMask:(NSUInteger)windowStyle
30 backing:(NSBackingStoreType)bufferingType 30 backing:(NSBackingStoreType)bufferingType
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 [path setWindingRule:NSEvenOddWindingRule]; 80 [path setWindingRule:NSEvenOddWindingRule];
81 [[NSGraphicsContext currentContext] setCompositingOperation: 81 [[NSGraphicsContext currentContext] setCompositingOperation:
82 NSCompositeCopy]; 82 NSCompositeCopy];
83 [[NSColor clearColor] set]; 83 [[NSColor clearColor] set];
84 [path fill]; 84 [path fill];
85 85
86 [[self window] invalidateShadow]; 86 [[self window] invalidateShadow];
87 } 87 }
88 88
89 @end 89 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698