OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 <AppKit/AppKit.h> | 5 #import <AppKit/AppKit.h> |
6 | 6 |
7 #include "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
| 8 #include "base/nsimage_cache_mac.h" |
8 #include "base/sys_string_conversions.h" | 9 #include "base/sys_string_conversions.h" |
9 #include "chrome/app/chrome_dll_resource.h" // IDC_BOOKMARK_MENU | 10 #include "chrome/app/chrome_dll_resource.h" // IDC_BOOKMARK_MENU |
10 #import "chrome/browser/app_controller_mac.h" | 11 #import "chrome/browser/app_controller_mac.h" |
11 #include "chrome/browser/bookmarks/bookmark_model.h" | 12 #include "chrome/browser/bookmarks/bookmark_model.h" |
12 #include "chrome/browser/browser.h" | 13 #include "chrome/browser/browser.h" |
13 #include "chrome/browser/browser_list.h" | 14 #include "chrome/browser/browser_list.h" |
14 #include "chrome/browser/cocoa/bookmark_menu_bridge.h" | 15 #include "chrome/browser/cocoa/bookmark_menu_bridge.h" |
15 #import "chrome/browser/cocoa/bookmark_menu_cocoa_controller.h" | 16 #import "chrome/browser/cocoa/bookmark_menu_cocoa_controller.h" |
16 #import "chrome/browser/cocoa/nsimage_cache.h" | |
17 #include "chrome/browser/profile.h" | 17 #include "chrome/browser/profile.h" |
18 #include "chrome/browser/profile_manager.h" | 18 #include "chrome/browser/profile_manager.h" |
19 #include "grit/generated_resources.h" | 19 #include "grit/generated_resources.h" |
20 #include "skia/ext/skia_utils_mac.h" | 20 #include "skia/ext/skia_utils_mac.h" |
21 | 21 |
22 BookmarkMenuBridge::BookmarkMenuBridge(Profile* profile) | 22 BookmarkMenuBridge::BookmarkMenuBridge(Profile* profile) |
23 : profile_(profile), | 23 : profile_(profile), |
24 controller_([[BookmarkMenuCocoaController alloc] initWithBridge:this]) { | 24 controller_([[BookmarkMenuCocoaController alloc] initWithBridge:this]) { |
25 if (GetBookmarkModel()) | 25 if (GetBookmarkModel()) |
26 ObserveBookmarkModel(); | 26 ObserveBookmarkModel(); |
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
219 | 219 |
220 NSMenuItem* BookmarkMenuBridge::MenuItemForNode(const BookmarkNode* node) { | 220 NSMenuItem* BookmarkMenuBridge::MenuItemForNode(const BookmarkNode* node) { |
221 if (!node) | 221 if (!node) |
222 return nil; | 222 return nil; |
223 std::map<const BookmarkNode*, NSMenuItem*>::iterator it = | 223 std::map<const BookmarkNode*, NSMenuItem*>::iterator it = |
224 bookmark_nodes_.find(node); | 224 bookmark_nodes_.find(node); |
225 if (it == bookmark_nodes_.end()) | 225 if (it == bookmark_nodes_.end()) |
226 return nil; | 226 return nil; |
227 return it->second; | 227 return it->second; |
228 } | 228 } |
OLD | NEW |