OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/frame/browser_frame_mac.h" | 5 #include "chrome/browser/ui/views/frame/browser_frame_mac.h" |
6 | 6 |
| 7 #import "chrome/browser/ui/cocoa/browser_window_command_handler.h" |
7 #import "chrome/browser/ui/cocoa/chrome_command_dispatcher_delegate.h" | 8 #import "chrome/browser/ui/cocoa/chrome_command_dispatcher_delegate.h" |
8 #include "chrome/browser/ui/views/frame/browser_frame.h" | 9 #include "chrome/browser/ui/views/frame/browser_frame.h" |
9 #include "chrome/browser/ui/views/frame/browser_shutdown.h" | 10 #include "chrome/browser/ui/views/frame/browser_shutdown.h" |
10 #include "chrome/browser/ui/views/frame/browser_view.h" | 11 #include "chrome/browser/ui/views/frame/browser_view.h" |
11 #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" |
12 #include "components/web_modal/web_contents_modal_dialog_host.h" | 13 #include "components/web_modal/web_contents_modal_dialog_host.h" |
13 #import "ui/base/cocoa/window_size_constants.h" | 14 #import "ui/base/cocoa/window_size_constants.h" |
14 | 15 |
15 BrowserFrameMac::BrowserFrameMac(BrowserFrame* browser_frame, | 16 BrowserFrameMac::BrowserFrameMac(BrowserFrame* browser_frame, |
16 BrowserView* browser_view) | 17 BrowserView* browser_view) |
17 : views::NativeWidgetMac(browser_frame), | 18 : views::NativeWidgetMac(browser_frame), |
18 browser_view_(browser_view), | 19 browser_view_(browser_view), |
19 command_dispatcher_delegate_( | 20 command_dispatcher_delegate_( |
20 [[ChromeCommandDispatcherDelegate alloc] init]) {} | 21 [[ChromeCommandDispatcherDelegate alloc] init]), |
| 22 command_handler_([[BrowserWindowCommandHandler alloc] init]) {} |
21 | 23 |
22 BrowserFrameMac::~BrowserFrameMac() { | 24 BrowserFrameMac::~BrowserFrameMac() { |
23 } | 25 } |
24 | 26 |
25 //////////////////////////////////////////////////////////////////////////////// | 27 //////////////////////////////////////////////////////////////////////////////// |
26 // BrowserFrameMac, views::NativeWidgetMac implementation: | 28 // BrowserFrameMac, views::NativeWidgetMac implementation: |
27 | 29 |
28 void BrowserFrameMac::OnWindowWillClose() { | 30 void BrowserFrameMac::OnWindowWillClose() { |
29 // Destroy any remaining WebContents early on. This is consistent with Aura. | 31 // Destroy any remaining WebContents early on. This is consistent with Aura. |
30 // See comment in DesktopBrowserFrameAura::OnHostClosed(). | 32 // See comment in DesktopBrowserFrameAura::OnHostClosed(). |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
63 NSUInteger style_mask = NSTitledWindowMask | NSClosableWindowMask | | 65 NSUInteger style_mask = NSTitledWindowMask | NSClosableWindowMask | |
64 NSMiniaturizableWindowMask | NSResizableWindowMask | | 66 NSMiniaturizableWindowMask | NSResizableWindowMask | |
65 NSTexturedBackgroundWindowMask; | 67 NSTexturedBackgroundWindowMask; |
66 base::scoped_nsobject<NativeWidgetMacFramelessNSWindow> ns_window( | 68 base::scoped_nsobject<NativeWidgetMacFramelessNSWindow> ns_window( |
67 [[NativeWidgetMacFramelessNSWindow alloc] | 69 [[NativeWidgetMacFramelessNSWindow alloc] |
68 initWithContentRect:ui::kWindowSizeDeterminedLater | 70 initWithContentRect:ui::kWindowSizeDeterminedLater |
69 styleMask:style_mask | 71 styleMask:style_mask |
70 backing:NSBackingStoreBuffered | 72 backing:NSBackingStoreBuffered |
71 defer:NO]); | 73 defer:NO]); |
72 [ns_window setCommandDispatcherDelegate:command_dispatcher_delegate_]; | 74 [ns_window setCommandDispatcherDelegate:command_dispatcher_delegate_]; |
| 75 [ns_window setCommandHandler:command_handler_]; |
73 return ns_window.autorelease(); | 76 return ns_window.autorelease(); |
74 } | 77 } |
75 | 78 |
76 //////////////////////////////////////////////////////////////////////////////// | 79 //////////////////////////////////////////////////////////////////////////////// |
77 // BrowserFrameMac, NativeBrowserFrame implementation: | 80 // BrowserFrameMac, NativeBrowserFrame implementation: |
78 | 81 |
79 views::Widget::InitParams BrowserFrameMac::GetWidgetParams() { | 82 views::Widget::InitParams BrowserFrameMac::GetWidgetParams() { |
80 views::Widget::InitParams params; | 83 views::Widget::InitParams params; |
81 params.native_widget = this; | 84 params.native_widget = this; |
82 return params; | 85 return params; |
(...skipping 14 matching lines...) Expand all Loading... |
97 void BrowserFrameMac::GetWindowPlacement( | 100 void BrowserFrameMac::GetWindowPlacement( |
98 gfx::Rect* bounds, | 101 gfx::Rect* bounds, |
99 ui::WindowShowState* show_state) const { | 102 ui::WindowShowState* show_state) const { |
100 return NativeWidgetMac::GetWindowPlacement(bounds, show_state); | 103 return NativeWidgetMac::GetWindowPlacement(bounds, show_state); |
101 } | 104 } |
102 | 105 |
103 int BrowserFrameMac::GetMinimizeButtonOffset() const { | 106 int BrowserFrameMac::GetMinimizeButtonOffset() const { |
104 NOTIMPLEMENTED(); | 107 NOTIMPLEMENTED(); |
105 return 0; | 108 return 0; |
106 } | 109 } |
OLD | NEW |