chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm - Issue 10656014: Merge 143605 - grd file update for new 2x assets

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

Issue 10656014: Merge 143605 - grd file update for new 2x assets (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1180/src/

Patch Set: Created 8 years, 6 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

« no previous file with comments | « chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm ('k') | chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/profiles/profile.h"	11 #include "chrome/browser/profiles/profile.h"

12 #include "chrome/browser/profiles/profile_manager.h"	12 #include "chrome/browser/profiles/profile_manager.h"

13 #include "chrome/browser/ui/browser_list.h"	13 #include "chrome/browser/ui/browser_list.h"

14 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h"	14 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h"

15 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h"	15 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h"

16 #include "grit/generated_resources.h"	16 #include "grit/generated_resources.h"

17 #include "grit/theme_resources.h"	17 #include "grit/theme_resources_standard.h"

18 #include "skia/ext/skia_utils_mac.h"	18 #include "skia/ext/skia_utils_mac.h"

19 #include "ui/base/l10n/l10n_util.h"	19 #include "ui/base/l10n/l10n_util.h"

20 #include "ui/base/resource/resource_bundle.h"	20 #include "ui/base/resource/resource_bundle.h"

21 #include "ui/gfx/image/image.h"	21 #include "ui/gfx/image/image.h"

22 #include "ui/gfx/mac/nsimage_cache.h"	22 #include "ui/gfx/mac/nsimage_cache.h"

23	23

24 BookmarkMenuBridge::BookmarkMenuBridge(Profile* profile, NSMenu* menu)	24 BookmarkMenuBridge::BookmarkMenuBridge(Profile* profile, NSMenu* menu)

25 : menuIsValid_(false),	25 : menuIsValid_(false),

26 profile_(profile),	26 profile_(profile),

27 controller_([[BookmarkMenuCocoaController alloc] initWithBridge:this	27 controller_([[BookmarkMenuCocoaController alloc] initWithBridge:this

(...skipping 290 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
318	318

319 NSMenuItem* BookmarkMenuBridge::MenuItemForNode(const BookmarkNode* node) {	319 NSMenuItem* BookmarkMenuBridge::MenuItemForNode(const BookmarkNode* node) {

320 if (!node)	320 if (!node)

321 return nil;	321 return nil;

322 std::map<const BookmarkNode, NSMenuItem>::iterator it =	322 std::map<const BookmarkNode, NSMenuItem>::iterator it =

323 bookmark_nodes_.find(node);	323 bookmark_nodes_.find(node);

324 if (it == bookmark_nodes_.end())	324 if (it == bookmark_nodes_.end())

325 return nil;	325 return nil;

326 return it->second;	326 return it->second;

327 }	327 }

OLD	NEW