Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(136)

Side by Side Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm

Issue 6541031: Integrate gfx::Image into the ResourceBundle. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/mac/nsimage_cache.h" 7 #include "app/mac/nsimage_cache.h"
8 #include "base/sys_string_conversions.h" 8 #include "base/sys_string_conversions.h"
9 #include "chrome/app/chrome_command_ids.h" 9 #include "chrome/app/chrome_command_ids.h"
10 #import "chrome/browser/app_controller_mac.h" 10 #import "chrome/browser/app_controller_mac.h"
11 #include "chrome/browser/bookmarks/bookmark_model.h" 11 #include "chrome/browser/bookmarks/bookmark_model.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 "skia/ext/skia_utils_mac.h" 19 #include "skia/ext/skia_utils_mac.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.h"
22 23
23 BookmarkMenuBridge::BookmarkMenuBridge(Profile* profile) 24 BookmarkMenuBridge::BookmarkMenuBridge(Profile* profile)
24 : menuIsValid_(false), 25 : menuIsValid_(false),
25 profile_(profile), 26 profile_(profile),
26 controller_([[BookmarkMenuCocoaController alloc] initWithBridge:this]) { 27 controller_([[BookmarkMenuCocoaController alloc] initWithBridge:this]) {
27 if (GetBookmarkModel()) 28 if (GetBookmarkModel())
28 ObserveBookmarkModel(); 29 ObserveBookmarkModel();
29 } 30 }
30 31
31 BookmarkMenuBridge::~BookmarkMenuBridge() { 32 BookmarkMenuBridge::~BookmarkMenuBridge() {
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 287
287 NSMenuItem* BookmarkMenuBridge::MenuItemForNode(const BookmarkNode* node) { 288 NSMenuItem* BookmarkMenuBridge::MenuItemForNode(const BookmarkNode* node) {
288 if (!node) 289 if (!node)
289 return nil; 290 return nil;
290 std::map<const BookmarkNode*, NSMenuItem*>::iterator it = 291 std::map<const BookmarkNode*, NSMenuItem*>::iterator it =
291 bookmark_nodes_.find(node); 292 bookmark_nodes_.find(node);
292 if (it == bookmark_nodes_.end()) 293 if (it == bookmark_nodes_.end())
293 return nil; 294 return nil;
294 return it->second; 295 return it->second;
295 } 296 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698