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

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

Issue 820713008: [Extensions Toolbar Mac] Implement drag-and-drop for the overflow menu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 12 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 #ifndef CHROME_BROWSER_UI_COCOA_EXTENSIONS_BROWSER_ACTIONS_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_EXTENSIONS_BROWSER_ACTIONS_CONTROLLER_H_
6 #define CHROME_BROWSER_UI_COCOA_EXTENSIONS_BROWSER_ACTIONS_CONTROLLER_H_ 6 #define CHROME_BROWSER_UI_COCOA_EXTENSIONS_BROWSER_ACTIONS_CONTROLLER_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"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 57
58 // The chevron button used when Browser Actions are hidden. 58 // The chevron button used when Browser Actions are hidden.
59 base::scoped_nsobject<MenuButton> chevronMenuButton_; 59 base::scoped_nsobject<MenuButton> chevronMenuButton_;
60 60
61 // The Browser Actions overflow menu. 61 // The Browser Actions overflow menu.
62 base::scoped_nsobject<NSMenu> overflowMenu_; 62 base::scoped_nsobject<NSMenu> overflowMenu_;
63 } 63 }
64 64
65 @property(readonly, nonatomic) BrowserActionsContainerView* containerView; 65 @property(readonly, nonatomic) BrowserActionsContainerView* containerView;
66 @property(readonly, nonatomic) Browser* browser; 66 @property(readonly, nonatomic) Browser* browser;
67 @property(readonly, nonatomic) BOOL isOverflow;
67 68
68 // Initializes the controller given the current browser and container view that 69 // Initializes the controller given the current browser and container view that
69 // will hold the browser action buttons. If |mainController| is nil, the created 70 // will hold the browser action buttons. If |mainController| is nil, the created
70 // BrowserActionsController will be the main controller; otherwise (if this is 71 // BrowserActionsController will be the main controller; otherwise (if this is
71 // for the overflow menu), |mainController| should be controller of the main bar 72 // for the overflow menu), |mainController| should be controller of the main bar
72 // for the |browser|. 73 // for the |browser|.
73 - (id)initWithBrowser:(Browser*)browser 74 - (id)initWithBrowser:(Browser*)browser
74 containerView:(BrowserActionsContainerView*)container 75 containerView:(BrowserActionsContainerView*)container
75 mainController:(BrowserActionsController*)mainController; 76 mainController:(BrowserActionsController*)mainController;
76 77
(...skipping 26 matching lines...) Expand all
103 @end // @interface BrowserActionsController 104 @end // @interface BrowserActionsController
104 105
105 @interface BrowserActionsController(TestingAPI) 106 @interface BrowserActionsController(TestingAPI)
106 - (BrowserActionButton*)buttonWithIndex:(NSUInteger)index; 107 - (BrowserActionButton*)buttonWithIndex:(NSUInteger)index;
107 - (ToolbarActionsBar*)toolbarActionsBar; 108 - (ToolbarActionsBar*)toolbarActionsBar;
108 + (BrowserActionsController*)fromToolbarActionsBarDelegate: 109 + (BrowserActionsController*)fromToolbarActionsBarDelegate:
109 (ToolbarActionsBarDelegate*)delegate; 110 (ToolbarActionsBarDelegate*)delegate;
110 @end 111 @end
111 112
112 #endif // CHROME_BROWSER_UI_COCOA_EXTENSIONS_BROWSER_ACTIONS_CONTROLLER_H_ 113 #endif // CHROME_BROWSER_UI_COCOA_EXTENSIONS_BROWSER_ACTIONS_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698