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

Side by Side Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_button.h

Issue 2200303004: [Mac][Material Design] Adjust bookmark spacing and folder menu drawing. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix tests, changes for icon-only items. Created 4 years, 4 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 <Cocoa/Cocoa.h> 5 #import <Cocoa/Cocoa.h>
6 #include <vector> 6 #include <vector>
7 #import "chrome/browser/ui/cocoa/draggable_button.h" 7 #import "chrome/browser/ui/cocoa/draggable_button.h"
8 #import "chrome/browser/ui/cocoa/themed_window.h" 8 #import "chrome/browser/ui/cocoa/themed_window.h"
9 #include "ui/base/window_open_disposition.h" 9 #include "ui/base/window_open_disposition.h"
10 10
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 // end of a drag operation (or, in fact, can be dragged to a completely 207 // end of a drag operation (or, in fact, can be dragged to a completely
208 // different window), so there is no way to retrieve the same BWC object after 208 // different window), so there is no way to retrieve the same BWC object after
209 // a drag. 209 // a drag.
210 BrowserWindowController* visibilityDelegate_; // weak 210 BrowserWindowController* visibilityDelegate_; // weak
211 211
212 NSPoint dragMouseOffset_; 212 NSPoint dragMouseOffset_;
213 NSPoint dragEndScreenLocation_; 213 NSPoint dragEndScreenLocation_;
214 BOOL dragPending_; 214 BOOL dragPending_;
215 BOOL acceptsTrackIn_; 215 BOOL acceptsTrackIn_;
216 NSTrackingArea* area_; 216 NSTrackingArea* area_;
217 NSColor* backgroundColor_;
217 } 218 }
218 219
219 @property(assign, nonatomic) NSObject<BookmarkButtonDelegate>* delegate; 220 @property(assign, nonatomic) NSObject<BookmarkButtonDelegate>* delegate;
220 @property(assign, nonatomic) BOOL acceptsTrackIn; 221 @property(assign, nonatomic) BOOL acceptsTrackIn;
222 @property(retain, nonatomic) NSColor* backgroundColor;
221 223
222 // Return the bookmark node associated with this button, or NULL. 224 // Return the bookmark node associated with this button, or NULL.
223 - (const bookmarks::BookmarkNode*)bookmarkNode; 225 - (const bookmarks::BookmarkNode*)bookmarkNode;
224 226
225 // Return YES if this is a folder button (the node has subnodes). 227 // Return YES if this is a folder button (the node has subnodes).
226 - (BOOL)isFolder; 228 - (BOOL)isFolder;
227 229
228 - (void)mouseDragged:(NSEvent*)theEvent; 230 - (void)mouseDragged:(NSEvent*)theEvent;
229 231
230 - (BOOL)acceptsTrackInFrom:(id)sender; 232 - (BOOL)acceptsTrackInFrom:(id)sender;
(...skipping 21 matching lines...) Expand all
252 + (BookmarkButton*)draggedButton; 254 + (BookmarkButton*)draggedButton;
253 255
254 256
255 @end // @interface BookmarkButton 257 @end // @interface BookmarkButton
256 258
257 259
258 @interface BookmarkButton(TestingAPI) 260 @interface BookmarkButton(TestingAPI)
259 - (void)beginDrag:(NSEvent*)event; 261 - (void)beginDrag:(NSEvent*)event;
260 @end 262 @end
261 263
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_button.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698