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

Side by Side Diff: chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm

Issue 766263003: [Extension Toolbar] Refactor and finish pop out logic for actions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sky's + OWNERS 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/toolbar/toolbar_controller.h" 5 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/mac/bundle_locations.h" 9 #include "base/mac/bundle_locations.h"
10 #include "base/mac/mac_util.h" 10 #include "base/mac/mac_util.h"
(...skipping 572 matching lines...) Expand 10 before | Expand all | Expand 10 after
583 if (prefName == prefs::kShowHomeButton) { 583 if (prefName == prefs::kShowHomeButton) {
584 [self showOptionalHomeButton]; 584 [self showOptionalHomeButton];
585 } 585 }
586 } 586 }
587 587
588 - (void)createBrowserActionButtons { 588 - (void)createBrowserActionButtons {
589 if (!browserActionsController_.get()) { 589 if (!browserActionsController_.get()) {
590 browserActionsController_.reset([[BrowserActionsController alloc] 590 browserActionsController_.reset([[BrowserActionsController alloc]
591 initWithBrowser:browser_ 591 initWithBrowser:browser_
592 containerView:browserActionsContainerView_ 592 containerView:browserActionsContainerView_
593 isOverflow:NO]); 593 mainController:nil]);
594 [[NSNotificationCenter defaultCenter] 594 [[NSNotificationCenter defaultCenter]
595 addObserver:self 595 addObserver:self
596 selector:@selector(browserActionsContainerWillDrag:) 596 selector:@selector(browserActionsContainerWillDrag:)
597 name:kBrowserActionGrippyWillDragNotification 597 name:kBrowserActionGrippyWillDragNotification
598 object:browserActionsContainerView_]; 598 object:browserActionsContainerView_];
599 [[NSNotificationCenter defaultCenter] 599 [[NSNotificationCenter defaultCenter]
600 addObserver:self 600 addObserver:self
601 selector:@selector(browserActionsContainerDragged:) 601 selector:@selector(browserActionsContainerDragged:)
602 name:kBrowserActionGrippyDraggingNotification 602 name:kBrowserActionGrippyDraggingNotification
603 object:browserActionsContainerView_]; 603 object:browserActionsContainerView_];
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
850 - (void)hideDropURLsIndicatorInView:(NSView*)view { 850 - (void)hideDropURLsIndicatorInView:(NSView*)view {
851 // Do nothing. 851 // Do nothing.
852 } 852 }
853 853
854 // (URLDropTargetController protocol) 854 // (URLDropTargetController protocol)
855 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info { 855 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info {
856 return drag_util::IsUnsupportedDropData(profile_, info); 856 return drag_util::IsUnsupportedDropData(profile_, info);
857 } 857 }
858 858
859 @end 859 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698