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

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

Issue 803613002: [Extensions Toolbar Mac] Allow the overflow toolbar to use the theme provider (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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) 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 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h" 5 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/strings/sys_string_conversions.h" 9 #include "base/strings/sys_string_conversions.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 221
222 bool ToolbarActionsBarBridge::IsPopupRunning() const { 222 bool ToolbarActionsBarBridge::IsPopupRunning() const {
223 return [ExtensionPopupController popup] != nil; 223 return [ExtensionPopupController popup] != nil;
224 } 224 }
225 225
226 } // namespace 226 } // namespace
227 227
228 @implementation BrowserActionsController 228 @implementation BrowserActionsController
229 229
230 @synthesize containerView = containerView_; 230 @synthesize containerView = containerView_;
231 @synthesize browser = browser_;
231 232
232 #pragma mark - 233 #pragma mark -
233 #pragma mark Public Methods 234 #pragma mark Public Methods
234 235
235 - (id)initWithBrowser:(Browser*)browser 236 - (id)initWithBrowser:(Browser*)browser
236 containerView:(BrowserActionsContainerView*)container 237 containerView:(BrowserActionsContainerView*)container
237 isOverflow:(BOOL)isOverflow { 238 isOverflow:(BOOL)isOverflow {
238 DCHECK(browser && container); 239 DCHECK(browser && container);
239 240
240 if ((self = [super init])) { 241 if ((self = [super init])) {
(...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after
740 - (ToolbarActionsBar*)toolbarActionsBar { 741 - (ToolbarActionsBar*)toolbarActionsBar {
741 return toolbarActionsBar_.get(); 742 return toolbarActionsBar_.get();
742 } 743 }
743 744
744 + (BrowserActionsController*)fromToolbarActionsBarDelegate: 745 + (BrowserActionsController*)fromToolbarActionsBarDelegate:
745 (ToolbarActionsBarDelegate*)delegate { 746 (ToolbarActionsBarDelegate*)delegate {
746 return static_cast<ToolbarActionsBarBridge*>(delegate)->controller_for_test(); 747 return static_cast<ToolbarActionsBarBridge*>(delegate)->controller_for_test();
747 } 748 }
748 749
749 @end 750 @end
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/extensions/browser_actions_controller.h ('k') | chrome/browser/ui/cocoa/image_button_cell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698