OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 #include "chrome/browser/ui/views/apps/app_window_native_widget_mac.h" | 5 #include "chrome/browser/ui/views/apps/app_window_native_widget_mac.h" |
6 | 6 |
7 #import <Cocoa/Cocoa.h> | 7 #import <Cocoa/Cocoa.h> |
8 | 8 |
| 9 #import "base/mac/foundation_util.h" |
9 #import "chrome/browser/ui/cocoa/apps/titlebar_background_view.h" | 10 #import "chrome/browser/ui/cocoa/apps/titlebar_background_view.h" |
| 11 #import "chrome/browser/ui/cocoa/chrome_command_dispatcher_delegate.h" |
10 #import "chrome/browser/ui/views/frame/native_widget_mac_frameless_nswindow.h" | 12 #import "chrome/browser/ui/views/frame/native_widget_mac_frameless_nswindow.h" |
11 #include "extensions/browser/app_window/native_app_window.h" | 13 #include "extensions/browser/app_window/native_app_window.h" |
12 #import "ui/base/cocoa/window_size_constants.h" | 14 #import "ui/base/cocoa/window_size_constants.h" |
13 | 15 |
14 AppWindowNativeWidgetMac::AppWindowNativeWidgetMac( | 16 AppWindowNativeWidgetMac::AppWindowNativeWidgetMac( |
15 views::Widget* widget, | 17 views::Widget* widget, |
16 extensions::NativeAppWindow* native_app_window) | 18 extensions::NativeAppWindow* native_app_window) |
17 : NativeWidgetMac(widget), native_app_window_(native_app_window) { | 19 : NativeWidgetMac(widget), |
18 } | 20 native_app_window_(native_app_window), |
| 21 command_dispatcher_delegate_( |
| 22 [[ChromeCommandDispatcherDelegate alloc] init]) {} |
19 | 23 |
20 AppWindowNativeWidgetMac::~AppWindowNativeWidgetMac() { | 24 AppWindowNativeWidgetMac::~AppWindowNativeWidgetMac() { |
21 } | 25 } |
22 | 26 |
23 NSWindow* AppWindowNativeWidgetMac::CreateNSWindow( | 27 NSWindow* AppWindowNativeWidgetMac::CreateNSWindow( |
24 const views::Widget::InitParams& params) { | 28 const views::Widget::InitParams& params) { |
25 // If the window has a native or colored frame, use the same NSWindow as | 29 // If the window has a native or colored frame, use the same NSWindow as |
26 // NativeWidgetMac. | 30 // NativeWidgetMac. |
27 if (!native_app_window_->IsFrameless()) { | 31 if (!native_app_window_->IsFrameless()) { |
28 NSWindow* ns_window = NativeWidgetMac::CreateNSWindow(params); | 32 NSWindow* ns_window = NativeWidgetMac::CreateNSWindow(params); |
29 if (native_app_window_->HasFrameColor()) { | 33 if (native_app_window_->HasFrameColor()) { |
30 [TitlebarBackgroundView | 34 [TitlebarBackgroundView |
31 addToNSWindow:ns_window | 35 addToNSWindow:ns_window |
32 activeColor:native_app_window_->ActiveFrameColor() | 36 activeColor:native_app_window_->ActiveFrameColor() |
33 inactiveColor:native_app_window_->InactiveFrameColor()]; | 37 inactiveColor:native_app_window_->InactiveFrameColor()]; |
34 } | 38 } |
| 39 [base::mac::ObjCCastStrict<NativeWidgetMacNSWindow>(ns_window) |
| 40 setCommandDispatcherDelegate:command_dispatcher_delegate_]; |
35 return ns_window; | 41 return ns_window; |
36 } | 42 } |
37 | 43 |
38 // NSTexturedBackgroundWindowMask is needed to implement draggable window | 44 // NSTexturedBackgroundWindowMask is needed to implement draggable window |
39 // regions. | 45 // regions. |
40 NSUInteger style_mask = NSTexturedBackgroundWindowMask | NSTitledWindowMask | | 46 NSUInteger style_mask = NSTexturedBackgroundWindowMask | NSTitledWindowMask | |
41 NSClosableWindowMask | NSMiniaturizableWindowMask | | 47 NSClosableWindowMask | NSMiniaturizableWindowMask | |
42 NSResizableWindowMask; | 48 NSResizableWindowMask; |
43 return [[[NativeWidgetMacFramelessNSWindow alloc] | 49 base::scoped_nsobject<NativeWidgetMacFramelessNSWindow> ns_window( |
44 initWithContentRect:ui::kWindowSizeDeterminedLater | 50 [[NativeWidgetMacFramelessNSWindow alloc] |
45 styleMask:style_mask | 51 initWithContentRect:ui::kWindowSizeDeterminedLater |
46 backing:NSBackingStoreBuffered | 52 styleMask:style_mask |
47 defer:NO] autorelease]; | 53 backing:NSBackingStoreBuffered |
| 54 defer:NO]); |
| 55 [ns_window setCommandDispatcherDelegate:command_dispatcher_delegate_]; |
| 56 return ns_window.autorelease(); |
48 } | 57 } |
OLD | NEW |