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 #import "chrome/browser/ui/views/frame/browser_frame_mac.h" | 5 #import "chrome/browser/ui/views/frame/browser_frame_mac.h" |
6 | 6 |
7 #include "chrome/browser/global_keyboard_shortcuts_mac.h" | 7 #include "chrome/browser/global_keyboard_shortcuts_mac.h" |
8 #include "chrome/browser/ui/browser_command_controller.h" | 8 #include "chrome/browser/ui/browser_command_controller.h" |
9 #include "chrome/browser/ui/browser_commands.h" | 9 #include "chrome/browser/ui/browser_commands.h" |
10 #import "chrome/browser/ui/cocoa/browser_window_command_handler.h" | 10 #import "chrome/browser/ui/cocoa/browser_window_command_handler.h" |
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
109 [ns_window setCommandHandler:[[[BrowserWindowCommandHandler alloc] init] | 109 [ns_window setCommandHandler:[[[BrowserWindowCommandHandler alloc] init] |
110 autorelease]]; | 110 autorelease]]; |
111 return ns_window.autorelease(); | 111 return ns_window.autorelease(); |
112 } | 112 } |
113 | 113 |
114 int BrowserFrameMac::GetMinimizeButtonOffset() const { | 114 int BrowserFrameMac::GetMinimizeButtonOffset() const { |
115 NOTIMPLEMENTED(); | 115 NOTIMPLEMENTED(); |
116 return 0; | 116 return 0; |
117 } | 117 } |
118 | 118 |
| 119 int BrowserFrameMac::GetMinimizeButtonHeight() const { |
| 120 NOTIMPLEMENTED(); |
| 121 return 0; |
| 122 } |
| 123 |
119 //////////////////////////////////////////////////////////////////////////////// | 124 //////////////////////////////////////////////////////////////////////////////// |
120 // BrowserFrameMac, NativeBrowserFrame implementation: | 125 // BrowserFrameMac, NativeBrowserFrame implementation: |
121 | 126 |
122 views::Widget::InitParams BrowserFrameMac::GetWidgetParams() { | 127 views::Widget::InitParams BrowserFrameMac::GetWidgetParams() { |
123 views::Widget::InitParams params; | 128 views::Widget::InitParams params; |
124 params.native_widget = this; | 129 params.native_widget = this; |
125 return params; | 130 return params; |
126 } | 131 } |
127 | 132 |
128 bool BrowserFrameMac::UseCustomFrame() const { | 133 bool BrowserFrameMac::UseCustomFrame() const { |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
170 } | 175 } |
171 | 176 |
172 bool BrowserFrameMac::HandleKeyboardEvent( | 177 bool BrowserFrameMac::HandleKeyboardEvent( |
173 const content::NativeWebKeyboardEvent& event) { | 178 const content::NativeWebKeyboardEvent& event) { |
174 if (!ShouldHandleKeyboardEvent(event)) | 179 if (!ShouldHandleKeyboardEvent(event)) |
175 return false; | 180 return false; |
176 | 181 |
177 return HandleExtraKeyboardShortcut(event.os_event, browser_view_->browser(), | 182 return HandleExtraKeyboardShortcut(event.os_event, browser_view_->browser(), |
178 command_dispatcher_delegate_); | 183 command_dispatcher_delegate_); |
179 } | 184 } |
OLD | NEW |