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

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

Issue 216052: Mac: Empty bookmark bar should show IDS_BOOKMARKS_NO_ITEMS. (Closed)
Patch Set: Committed ver. Created 11 years, 3 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
Index: chrome/browser/cocoa/bookmark_bar_controller.mm
diff --git a/chrome/browser/cocoa/bookmark_bar_controller.mm b/chrome/browser/cocoa/bookmark_bar_controller.mm
index 457138e469e39f936f6a496c0cfc0cf6842f1ecb..a5914225379a09f84dc5d51b319f05bfdd7dff72 100644
--- a/chrome/browser/cocoa/bookmark_bar_controller.mm
+++ b/chrome/browser/cocoa/bookmark_bar_controller.mm
@@ -10,6 +10,7 @@
#include "chrome/browser/browser_list.h"
#import "chrome/browser/cocoa/bookmark_bar_bridge.h"
#import "chrome/browser/cocoa/bookmark_bar_controller.h"
+#import "chrome/browser/cocoa/bookmark_bar_view.h"
#import "chrome/browser/cocoa/bookmark_button_cell.h"
#import "chrome/browser/cocoa/bookmark_editor_controller.h"
#import "chrome/browser/cocoa/bookmark_name_folder_controller.h"
@@ -441,7 +442,7 @@ const CGFloat kBookmarkHorizontalPadding = 1.0;
// ends.
}
-- (NSView*)buttonView {
+- (BookmarkBarView*)buttonView {
return buttonView_;
}
@@ -547,6 +548,10 @@ const CGFloat kBookmarkHorizontalPadding = 1.0;
// like the contextual menu which is invoked when not over a
// bookmark. On Safari that menu has a "new folder" option.
- (void)addNodesToBar:(const BookmarkNode*)node {
+ BOOL hidden = (node->GetChildCount() == 0) ? NO : YES;
+ NSView* item = [buttonView_ noItemTextfield];
+ [item setHidden:hidden];
+
int x_offset = 0;
for (int i = 0; i < node->GetChildCount(); i++) {
const BookmarkNode* child = node->GetChild(i);
« no previous file with comments | « chrome/browser/cocoa/bookmark_bar_controller.h ('k') | chrome/browser/cocoa/bookmark_bar_controller_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698