OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "base/sys_string_conversions.h" | 7 #include "base/sys_string_conversions.h" |
8 #include "chrome/app/chrome_command_ids.h" | 8 #include "chrome/app/chrome_command_ids.h" |
9 #import "chrome/browser/app_controller_mac.h" | 9 #import "chrome/browser/app_controller_mac.h" |
10 #include "chrome/browser/bookmarks/bookmark_model.h" | 10 #include "chrome/browser/bookmarks/bookmark_model.h" |
11 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 11 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
12 #include "chrome/browser/profiles/profile.h" | 12 #include "chrome/browser/profiles/profile.h" |
13 #include "chrome/browser/profiles/profile_manager.h" | 13 #include "chrome/browser/profiles/profile_manager.h" |
14 #include "chrome/browser/ui/browser_list.h" | 14 #include "chrome/browser/ui/browser_list.h" |
15 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h" | 15 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h" |
16 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h" | 16 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h" |
17 #include "grit/generated_resources.h" | 17 #include "grit/generated_resources.h" |
18 #include "grit/theme_resources.h" | 18 #include "grit/theme_resources.h" |
19 #include "grit/ui_resources.h" | 19 #include "grit/ui_resources.h" |
20 #include "ui/base/l10n/l10n_util.h" | 20 #include "ui/base/l10n/l10n_util.h" |
21 #include "ui/base/resource/resource_bundle.h" | 21 #include "ui/base/resource/resource_bundle.h" |
22 #include "ui/gfx/image/image.h" | 22 #include "ui/gfx/image/image.h" |
23 #include "ui/gfx/mac/nsimage_cache.h" | |
24 | 23 |
25 BookmarkMenuBridge::BookmarkMenuBridge(Profile* profile, NSMenu* menu) | 24 BookmarkMenuBridge::BookmarkMenuBridge(Profile* profile, NSMenu* menu) |
26 : menuIsValid_(false), | 25 : menuIsValid_(false), |
27 profile_(profile), | 26 profile_(profile), |
28 controller_([[BookmarkMenuCocoaController alloc] initWithBridge:this | 27 controller_([[BookmarkMenuCocoaController alloc] initWithBridge:this |
29 andMenu:menu]) { | 28 andMenu:menu]) { |
30 if (GetBookmarkModel()) | 29 if (GetBookmarkModel()) |
31 ObserveBookmarkModel(); | 30 ObserveBookmarkModel(); |
32 } | 31 } |
33 | 32 |
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
320 | 319 |
321 NSMenuItem* BookmarkMenuBridge::MenuItemForNode(const BookmarkNode* node) { | 320 NSMenuItem* BookmarkMenuBridge::MenuItemForNode(const BookmarkNode* node) { |
322 if (!node) | 321 if (!node) |
323 return nil; | 322 return nil; |
324 std::map<const BookmarkNode*, NSMenuItem*>::iterator it = | 323 std::map<const BookmarkNode*, NSMenuItem*>::iterator it = |
325 bookmark_nodes_.find(node); | 324 bookmark_nodes_.find(node); |
326 if (it == bookmark_nodes_.end()) | 325 if (it == bookmark_nodes_.end()) |
327 return nil; | 326 return nil; |
328 return it->second; | 327 return it->second; |
329 } | 328 } |
OLD | NEW |