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

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

Issue 1993313002: [Mac][Material Design] Show light default favicon in Incognito mode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #ifndef CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_BAR_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_BAR_CONTROLLER_H_
6 #define CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_BAR_CONTROLLER_H_ 6 #define CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_BAR_CONTROLLER_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 // The folder image so we can use one copy for all buttons 196 // The folder image so we can use one copy for all buttons
197 base::scoped_nsobject<NSImage> folderImage_; 197 base::scoped_nsobject<NSImage> folderImage_;
198 198
199 // The Material Design Incognito folder image so we can use one copy for all 199 // The Material Design Incognito folder image so we can use one copy for all
200 // buttons 200 // buttons
201 base::scoped_nsobject<NSImage> folderImageWhite_; 201 base::scoped_nsobject<NSImage> folderImageWhite_;
202 202
203 // The default image, so we can use one copy for all buttons. 203 // The default image, so we can use one copy for all buttons.
204 base::scoped_nsobject<NSImage> defaultImage_; 204 base::scoped_nsobject<NSImage> defaultImage_;
205 205
206 // The Incognito version of the default image.
207 base::scoped_nsobject<NSImage> defaultImageIncognito_;
208
206 // If the bar is disabled, we hide it and ignore show/hide commands. 209 // If the bar is disabled, we hide it and ignore show/hide commands.
207 // Set when using fullscreen mode. 210 // Set when using fullscreen mode.
208 BOOL barIsEnabled_; 211 BOOL barIsEnabled_;
209 212
210 // Bridge from Chrome-style C++ notifications (e.g. derived from 213 // Bridge from Chrome-style C++ notifications (e.g. derived from
211 // BookmarkModelObserver) 214 // BookmarkModelObserver)
212 std::unique_ptr<BookmarkBarBridge> bridge_; 215 std::unique_ptr<BookmarkBarBridge> bridge_;
213 216
214 // Delegate that is informed about state changes in the bookmark bar. 217 // Delegate that is informed about state changes in the bookmark bar.
215 id<BookmarkBarControllerDelegate> delegate_; // weak 218 id<BookmarkBarControllerDelegate> delegate_; // weak
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
455 - (BookmarkButton*)buttonForDroppingOnAtPoint:(NSPoint)point; 458 - (BookmarkButton*)buttonForDroppingOnAtPoint:(NSPoint)point;
456 - (BOOL)isEventAnExitEvent:(NSEvent*)event; 459 - (BOOL)isEventAnExitEvent:(NSEvent*)event;
457 - (BOOL)shrinkOrHideView:(NSView*)view forMaxX:(CGFloat)maxViewX; 460 - (BOOL)shrinkOrHideView:(NSView*)view forMaxX:(CGFloat)maxViewX;
458 - (void)unhighlightBookmark:(const bookmarks::BookmarkNode*)node; 461 - (void)unhighlightBookmark:(const bookmarks::BookmarkNode*)node;
459 462
460 // The following are for testing purposes only and are not used internally. 463 // The following are for testing purposes only and are not used internally.
461 - (NSMenu *)menuForFolderNode:(const bookmarks::BookmarkNode*)node; 464 - (NSMenu *)menuForFolderNode:(const bookmarks::BookmarkNode*)node;
462 @end 465 @end
463 466
464 #endif // CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_BAR_CONTROLLER_H_ 467 #endif // CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_BAR_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698