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

Side by Side Diff: chrome/browser/ui/cocoa/extensions/browser_action_button.h

Issue 1770573002: Update extension buttons to Material Design (Mac). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@md_toolbar
Patch Set: Code clean-up. Created 4 years, 9 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/extensions/browser_action_button.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_EXTENSIONS_BROWSER_ACTION_BUTTON_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_EXTENSIONS_BROWSER_ACTION_BUTTON_H_
6 #define CHROME_BROWSER_UI_COCOA_EXTENSIONS_BROWSER_ACTION_BUTTON_H_ 6 #define CHROME_BROWSER_UI_COCOA_EXTENSIONS_BROWSER_ACTION_BUTTON_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #import "base/mac/scoped_nsobject.h" 10 #import "base/mac/scoped_nsobject.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #import "chrome/browser/ui/cocoa/image_button_cell.h" 12 #import "chrome/browser/ui/cocoa/image_button_cell.h"
13 #import "chrome/browser/ui/cocoa/toolbar/toolbar_button_cocoa.h"
13 14
14 class Browser; 15 class Browser;
15 @class BrowserActionsController; 16 @class BrowserActionsController;
16 @class MenuController; 17 @class MenuController;
17 class ToolbarActionViewController; 18 class ToolbarActionViewController;
18 class ToolbarActionViewDelegateBridge; 19 class ToolbarActionViewDelegateBridge;
19 20
20 // Fired on each drag event while the user is moving the button. 21 // Fired on each drag event while the user is moving the button.
21 extern NSString* const kBrowserActionButtonDraggingNotification; 22 extern NSString* const kBrowserActionButtonDraggingNotification;
22 // Fired when the user drops the button. 23 // Fired when the user drops the button.
23 extern NSString* const kBrowserActionButtonDragEndNotification; 24 extern NSString* const kBrowserActionButtonDragEndNotification;
24 25
25 @interface BrowserActionButton : NSButton<NSMenuDelegate> { 26 @interface BrowserActionButton : ToolbarButton<NSMenuDelegate> {
26 @private 27 @private
27 // Used to move the button and query whether a button is currently animating. 28 // Used to move the button and query whether a button is currently animating.
28 base::scoped_nsobject<NSViewAnimation> moveAnimation_; 29 base::scoped_nsobject<NSViewAnimation> moveAnimation_;
29 30
30 // The controller that handles most non-view logic. 31 // The controller that handles most non-view logic.
31 ToolbarActionViewController* viewController_; 32 ToolbarActionViewController* viewController_;
32 33
33 // The bridge between the view controller and this object. 34 // The bridge between the view controller and this object.
34 scoped_ptr<ToolbarActionViewDelegateBridge> viewControllerDelegate_; 35 scoped_ptr<ToolbarActionViewDelegateBridge> viewControllerDelegate_;
35 36
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 // The controller for the browser actions bar that owns the button. Weak. 103 // The controller for the browser actions bar that owns the button. Weak.
103 BrowserActionsController* browserActionsController_; 104 BrowserActionsController* browserActionsController_;
104 } 105 }
105 106
106 @property(assign, nonatomic) 107 @property(assign, nonatomic)
107 BrowserActionsController* browserActionsController; 108 BrowserActionsController* browserActionsController;
108 109
109 @end 110 @end
110 111
111 #endif // CHROME_BROWSER_UI_COCOA_EXTENSIONS_BROWSER_ACTION_BUTTON_H_ 112 #endif // CHROME_BROWSER_UI_COCOA_EXTENSIONS_BROWSER_ACTION_BUTTON_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/extensions/browser_action_button.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698