| OLD | NEW |
| 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 425 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 436 | 436 |
| 437 if (browserActionsController_.get()) { | 437 if (browserActionsController_.get()) { |
| 438 [browserActionsController_ update]; | 438 [browserActionsController_ update]; |
| 439 } | 439 } |
| 440 } | 440 } |
| 441 | 441 |
| 442 - (void)setStarredState:(BOOL)isStarred { | 442 - (void)setStarredState:(BOOL)isStarred { |
| 443 locationBarView_->SetStarred(isStarred ? true : false); | 443 locationBarView_->SetStarred(isStarred ? true : false); |
| 444 } | 444 } |
| 445 | 445 |
| 446 - (void)zoomChangedForActiveTab:(BOOL)canShowBubble { |
| 447 locationBarView_->ZoomChangedForActiveTab(canShowBubble ? true : false); |
| 448 } |
| 449 |
| 446 - (void)setIsLoading:(BOOL)isLoading force:(BOOL)force { | 450 - (void)setIsLoading:(BOOL)isLoading force:(BOOL)force { |
| 447 [reloadButton_ setIsLoading:isLoading force:force]; | 451 [reloadButton_ setIsLoading:isLoading force:force]; |
| 448 } | 452 } |
| 449 | 453 |
| 450 - (void)setHasToolbar:(BOOL)toolbar hasLocationBar:(BOOL)locBar { | 454 - (void)setHasToolbar:(BOOL)toolbar hasLocationBar:(BOOL)locBar { |
| 451 [self view]; // Force nib loading. | 455 [self view]; // Force nib loading. |
| 452 | 456 |
| 453 hasToolbar_ = toolbar; | 457 hasToolbar_ = toolbar; |
| 454 | 458 |
| 455 // If there's a toolbar, there must be a location bar. | 459 // If there's a toolbar, there must be a location bar. |
| (...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 796 - (void)hideDropURLsIndicatorInView:(NSView*)view { | 800 - (void)hideDropURLsIndicatorInView:(NSView*)view { |
| 797 // Do nothing. | 801 // Do nothing. |
| 798 } | 802 } |
| 799 | 803 |
| 800 // (URLDropTargetController protocol) | 804 // (URLDropTargetController protocol) |
| 801 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info { | 805 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info { |
| 802 return drag_util::IsUnsupportedDropData(profile_, info); | 806 return drag_util::IsUnsupportedDropData(profile_, info); |
| 803 } | 807 } |
| 804 | 808 |
| 805 @end | 809 @end |
| OLD | NEW |