OLD | NEW |
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/base/cocoa/menu_controller.h" | 5 #import "ui/base/cocoa/menu_controller.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/strings/sys_string_conversions.h" | 8 #include "base/strings/sys_string_conversions.h" |
9 #include "ui/base/accelerators/accelerator.h" | 9 #include "ui/base/accelerators/accelerator.h" |
10 #include "ui/base/accelerators/platform_accelerator_cocoa.h" | 10 #include "ui/base/accelerators/platform_accelerator_cocoa.h" |
11 #import "ui/base/cocoa/cocoa_event_utils.h" | 11 #import "ui/base/cocoa/cocoa_event_utils.h" |
12 #include "ui/base/l10n/l10n_util_mac.h" | 12 #include "ui/base/l10n/l10n_util_mac.h" |
13 #include "ui/base/models/simple_menu_model.h" | 13 #include "ui/base/models/simple_menu_model.h" |
14 #include "ui/base/text/text_elider.h" | 14 #include "ui/base/text/text_elider.h" |
| 15 #include "ui/gfx/font.h" |
15 #include "ui/gfx/image/image.h" | 16 #include "ui/gfx/image/image.h" |
16 | 17 |
17 @interface MenuController (Private) | 18 @interface MenuController (Private) |
18 - (void)addSeparatorToMenu:(NSMenu*)menu | 19 - (void)addSeparatorToMenu:(NSMenu*)menu |
19 atIndex:(int)index; | 20 atIndex:(int)index; |
20 @end | 21 @end |
21 | 22 |
22 @implementation MenuController | 23 @implementation MenuController |
23 | 24 |
24 @synthesize model = model_; | 25 @synthesize model = model_; |
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
235 } | 236 } |
236 | 237 |
237 - (void)menuDidClose:(NSMenu*)menu { | 238 - (void)menuDidClose:(NSMenu*)menu { |
238 if (isMenuOpen_) { | 239 if (isMenuOpen_) { |
239 model_->MenuClosed(); | 240 model_->MenuClosed(); |
240 isMenuOpen_ = NO; | 241 isMenuOpen_ = NO; |
241 } | 242 } |
242 } | 243 } |
243 | 244 |
244 @end | 245 @end |
OLD | NEW |