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

Unified Diff: chrome/browser/cocoa/bookmark_menu_bridge.mm

Issue 557085: Fix Mac browser crash in BookmarkMenuBridge::UpdateMenu. (Closed)
Patch Set: Created 10 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/cocoa/bookmark_menu_bridge.mm
diff --git a/chrome/browser/cocoa/bookmark_menu_bridge.mm b/chrome/browser/cocoa/bookmark_menu_bridge.mm
index d9742248d3757e8bf655b0be4b22b98fb0852a8b..006b10b1311093291bd27eb83d407eb975c59e51 100644
--- a/chrome/browser/cocoa/bookmark_menu_bridge.mm
+++ b/chrome/browser/cocoa/bookmark_menu_bridge.mm
@@ -47,6 +47,9 @@ void BookmarkMenuBridge::UpdateMenu(NSMenu* bookmark_menu) {
DCHECK(bookmark_menu);
if (menuIsValid_)
return;
+ BookmarkModel* model = GetBookmarkModel();
+ if (!model || !model->IsLoaded())
+ return;
if (!folder_image_) {
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
@@ -56,7 +59,8 @@ void BookmarkMenuBridge::UpdateMenu(NSMenu* bookmark_menu) {
ClearBookmarkMenu(bookmark_menu);
// Add bookmark bar items, if any.
- const BookmarkNode* barNode = GetBookmarkModel()->GetBookmarkBarNode();
+ const BookmarkNode* barNode = model->GetBookmarkBarNode();
+ CHECK(barNode);
if (barNode->GetChildCount()) {
[bookmark_menu addItem:[NSMenuItem separatorItem]];
AddNodeToMenu(barNode, bookmark_menu);
@@ -67,7 +71,7 @@ void BookmarkMenuBridge::UpdateMenu(NSMenu* bookmark_menu) {
l10n_util::GetString(IDS_BOOMARK_BAR_OTHER_FOLDER_NAME));
[bookmark_menu addItem:[NSMenuItem separatorItem]];
AddNodeAsSubmenu(bookmark_menu,
- GetBookmarkModel()->other_node(),
+ model->other_node(),
other_items_title);
menuIsValid_ = true;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698