| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/cocoa/toolbar_controller.h" | 5 #import "chrome/browser/cocoa/toolbar_controller.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "app/l10n_util_mac.h" | 9 #include "app/l10n_util_mac.h" |
| 10 #include "app/menus/accelerator_cocoa.h" | 10 #include "app/menus/accelerator_cocoa.h" |
| (...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 351 [[targetView cell] setMouseInside:YES animate:YES]; | 351 [[targetView cell] setMouseInside:YES animate:YES]; |
| 352 [hoveredButton_ release]; | 352 [hoveredButton_ release]; |
| 353 hoveredButton_ = [targetView retain]; | 353 hoveredButton_ = [targetView retain]; |
| 354 } | 354 } |
| 355 } | 355 } |
| 356 | 356 |
| 357 - (void)mouseEntered:(NSEvent*)event { | 357 - (void)mouseEntered:(NSEvent*)event { |
| 358 [self mouseMoved:event]; | 358 [self mouseMoved:event]; |
| 359 } | 359 } |
| 360 | 360 |
| 361 - (LocationBar*)locationBarBridge { | 361 - (LocationBarViewMac*)locationBarBridge { |
| 362 return locationBarView_.get(); | 362 return locationBarView_.get(); |
| 363 } | 363 } |
| 364 | 364 |
| 365 - (void)focusLocationBar:(BOOL)selectAll { | 365 - (void)focusLocationBar:(BOOL)selectAll { |
| 366 if (locationBarView_.get()) | 366 if (locationBarView_.get()) |
| 367 locationBarView_->FocusLocation(selectAll ? true : false); | 367 locationBarView_->FocusLocation(selectAll ? true : false); |
| 368 } | 368 } |
| 369 | 369 |
| 370 // Called when the state for a command changes to |enabled|. Update the | 370 // Called when the state for a command changes to |enabled|. Update the |
| 371 // corresponding UI element. | 371 // corresponding UI element. |
| (...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 728 - (void)indicateDropURLsInView:(NSView*)view at:(NSPoint)point { | 728 - (void)indicateDropURLsInView:(NSView*)view at:(NSPoint)point { |
| 729 // Do nothing. | 729 // Do nothing. |
| 730 } | 730 } |
| 731 | 731 |
| 732 // (URLDropTargetController protocol) | 732 // (URLDropTargetController protocol) |
| 733 - (void)hideDropURLsIndicatorInView:(NSView*)view { | 733 - (void)hideDropURLsIndicatorInView:(NSView*)view { |
| 734 // Do nothing. | 734 // Do nothing. |
| 735 } | 735 } |
| 736 | 736 |
| 737 @end | 737 @end |
| OLD | NEW |