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

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

Issue 10831372: Revert 152080 - Refactor browser window zoom handling and enable zoom icon on all platforms. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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 | Annotate | Revision Log
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 425 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
450 - (void)setIsLoading:(BOOL)isLoading force:(BOOL)force { 446 - (void)setIsLoading:(BOOL)isLoading force:(BOOL)force {
451 [reloadButton_ setIsLoading:isLoading force:force]; 447 [reloadButton_ setIsLoading:isLoading force:force];
452 } 448 }
453 449
454 - (void)setHasToolbar:(BOOL)toolbar hasLocationBar:(BOOL)locBar { 450 - (void)setHasToolbar:(BOOL)toolbar hasLocationBar:(BOOL)locBar {
455 [self view]; // Force nib loading. 451 [self view]; // Force nib loading.
456 452
457 hasToolbar_ = toolbar; 453 hasToolbar_ = toolbar;
458 454
459 // If there's a toolbar, there must be a location bar. 455 // If there's a toolbar, there must be a location bar.
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after
800 - (void)hideDropURLsIndicatorInView:(NSView*)view { 796 - (void)hideDropURLsIndicatorInView:(NSView*)view {
801 // Do nothing. 797 // Do nothing.
802 } 798 }
803 799
804 // (URLDropTargetController protocol) 800 // (URLDropTargetController protocol)
805 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info { 801 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info {
806 return drag_util::IsUnsupportedDropData(profile_, info); 802 return drag_util::IsUnsupportedDropData(profile_, info);
807 } 803 }
808 804
809 @end 805 @end
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/toolbar/toolbar_controller.h ('k') | chrome/browser/ui/gtk/browser_window_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698