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

Side by Side Diff: chrome/browser/cocoa/bookmark_bar_controller.h

Issue 339087: Mac: correct favicons in bookmarks bar (for pages w/o one and for subfolders). (Closed)
Patch Set: Updated per Nico's review and merged ToT. Created 11 years, 1 month 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
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 #ifndef CHROME_BROWSER_COCOA_BOOKMARK_BAR_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_COCOA_BOOKMARK_BAR_CONTROLLER_H_
6 #define CHROME_BROWSER_COCOA_BOOKMARK_BAR_CONTROLLER_H_ 6 #define CHROME_BROWSER_COCOA_BOOKMARK_BAR_CONTROLLER_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 #include <map> 9 #include <map>
10 10
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 // node from the item. When adding items in, we start with seedId_. 66 // node from the item. When adding items in, we start with seedId_.
67 int32 seedId_; 67 int32 seedId_;
68 std::map<int32,int64> menuTagMap_; 68 std::map<int32,int64> menuTagMap_;
69 69
70 // Our bookmark buttons, ordered from L-->R. 70 // Our bookmark buttons, ordered from L-->R.
71 scoped_nsobject<NSMutableArray> buttons_; 71 scoped_nsobject<NSMutableArray> buttons_;
72 72
73 // The folder image so we can use one copy for all buttons 73 // The folder image so we can use one copy for all buttons
74 scoped_nsobject<NSImage> folderImage_; 74 scoped_nsobject<NSImage> folderImage_;
75 75
76 // The default image, so we can use one copy for all buttons.
77 scoped_nsobject<NSImage> defaultImage_;
78
76 // If the bar is disabled, we hide it and ignore show/hide commands. 79 // If the bar is disabled, we hide it and ignore show/hide commands.
77 // Set when using fullscreen mode. 80 // Set when using fullscreen mode.
78 BOOL barIsEnabled_; 81 BOOL barIsEnabled_;
79 82
80 // Bridge from Chrome-style C++ notifications (e.g. derived from 83 // Bridge from Chrome-style C++ notifications (e.g. derived from
81 // BookmarkModelObserver) 84 // BookmarkModelObserver)
82 scoped_ptr<BookmarkBarBridge> bridge_; 85 scoped_ptr<BookmarkBarBridge> bridge_;
83 86
84 // Delegate that is alerted about whether it should be compressed because 87 // Delegate that is alerted about whether it should be compressed because
85 // it's right next to us. 88 // it's right next to us.
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 - (NSMenu *)menuForFolderNode:(const BookmarkNode*)node; 201 - (NSMenu *)menuForFolderNode:(const BookmarkNode*)node;
199 - (int64)nodeIdFromMenuTag:(int32)tag; 202 - (int64)nodeIdFromMenuTag:(int32)tag;
200 - (int32)menuTagFromNodeId:(int64)menuid; 203 - (int32)menuTagFromNodeId:(int64)menuid;
201 - (void)buildOffTheSideMenu; 204 - (void)buildOffTheSideMenu;
202 - (NSMenu*)offTheSideMenu; 205 - (NSMenu*)offTheSideMenu;
203 - (NSButton*)offTheSideButton; 206 - (NSButton*)offTheSideButton;
204 - (NSButton*)otherBookmarksButton; 207 - (NSButton*)otherBookmarksButton;
205 @end 208 @end
206 209
207 #endif // CHROME_BROWSER_COCOA_BOOKMARK_BAR_CONTROLLER_H_ 210 #endif // CHROME_BROWSER_COCOA_BOOKMARK_BAR_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/cocoa/bookmark_bar_controller.mm » ('j') | chrome/browser/cocoa/bookmark_bar_controller.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698