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

Side by Side Diff: ui/app_list/cocoa/app_list_window_controller.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, 5 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "ui/app_list/cocoa/app_list_window_controller.h" 5 #import "ui/app_list/cocoa/app_list_window_controller.h"
6 6
7 #include "ui/app_list/app_list_view_delegate.h" 7 #include "ui/app_list/app_list_view_delegate.h"
8 #import "ui/app_list/cocoa/app_list_view_controller.h" 8 #import "ui/app_list/cocoa/app_list_view_controller.h"
9 #import "ui/app_list/cocoa/apps_grid_controller.h" 9 #import "ui/app_list/cocoa/apps_grid_controller.h"
10 #include "ui/base/cocoa/window_size_constants.h" 10 #include "ui/base/cocoa/window_size_constants.h"
(...skipping 11 matching lines...) Expand all
22 22
23 - (BOOL)canBecomeMainWindow { 23 - (BOOL)canBecomeMainWindow {
24 return YES; 24 return YES;
25 } 25 }
26 26
27 @end 27 @end
28 28
29 @implementation AppListWindowController; 29 @implementation AppListWindowController;
30 30
31 - (id)init { 31 - (id)init {
32 scoped_nsobject<NSWindow> controlledWindow( 32 base::scoped_nsobject<NSWindow> controlledWindow(
33 [[AppListWindow alloc] initWithContentRect:ui::kWindowSizeDeterminedLater 33 [[AppListWindow alloc] initWithContentRect:ui::kWindowSizeDeterminedLater
34 styleMask:NSBorderlessWindowMask 34 styleMask:NSBorderlessWindowMask
35 backing:NSBackingStoreBuffered 35 backing:NSBackingStoreBuffered
36 defer:NO]); 36 defer:NO]);
37 [controlledWindow setReleasedWhenClosed:NO]; 37 [controlledWindow setReleasedWhenClosed:NO];
38 [controlledWindow setBackgroundColor:[NSColor clearColor]]; 38 [controlledWindow setBackgroundColor:[NSColor clearColor]];
39 [controlledWindow setOpaque:NO]; 39 [controlledWindow setOpaque:NO];
40 [controlledWindow setHasShadow:YES]; 40 [controlledWindow setHasShadow:YES];
41 41
42 if ((self = [super initWithWindow:controlledWindow])) { 42 if ((self = [super initWithWindow:controlledWindow])) {
43 appListViewController_.reset([[AppListViewController alloc] init]); 43 appListViewController_.reset([[AppListViewController alloc] init]);
44 [[self window] setFrame:[[appListViewController_ view] bounds] 44 [[self window] setFrame:[[appListViewController_ view] bounds]
45 display:NO]; 45 display:NO];
46 [[self window] setContentView:[appListViewController_ view]]; 46 [[self window] setContentView:[appListViewController_ view]];
47 [[self window] setDelegate:self]; 47 [[self window] setDelegate:self];
48 } 48 }
49 return self; 49 return self;
50 } 50 }
51 51
52 - (AppListViewController*)appListViewController { 52 - (AppListViewController*)appListViewController {
53 return appListViewController_; 53 return appListViewController_;
54 } 54 }
55 55
56 - (void)windowDidResignMain:(NSNotification*)notification { 56 - (void)windowDidResignMain:(NSNotification*)notification {
57 if ([appListViewController_ delegate]) 57 if ([appListViewController_ delegate])
58 [appListViewController_ delegate]->Dismiss(); 58 [appListViewController_ delegate]->Dismiss();
59 } 59 }
60 60
61 @end 61 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698