| 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/ui/cocoa/toolbar_controller.h" | 5 #import "chrome/browser/ui/cocoa/toolbar_controller.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "app/l10n_util.h" | 9 #include "app/l10n_util.h" |
| 10 #include "app/l10n_util_mac.h" | 10 #include "app/l10n_util_mac.h" |
| 11 #include "app/menus/accelerator_cocoa.h" | 11 #include "app/menus/accelerator_cocoa.h" |
| 12 #include "app/menus/menu_model.h" | 12 #include "app/menus/menu_model.h" |
| 13 #include "app/resource_bundle.h" |
| 13 #include "base/mac_util.h" | 14 #include "base/mac_util.h" |
| 14 #include "base/nsimage_cache_mac.h" | 15 #include "base/nsimage_cache_mac.h" |
| 15 #include "base/singleton.h" | 16 #include "base/singleton.h" |
| 16 #include "base/sys_string_conversions.h" | 17 #include "base/sys_string_conversions.h" |
| 17 #include "chrome/app/chrome_command_ids.h" | 18 #include "chrome/app/chrome_command_ids.h" |
| 18 #include "chrome/browser/autocomplete/autocomplete.h" | 19 #include "chrome/browser/autocomplete/autocomplete.h" |
| 19 #include "chrome/browser/autocomplete/autocomplete_classifier.h" | 20 #include "chrome/browser/autocomplete/autocomplete_classifier.h" |
| 20 #include "chrome/browser/autocomplete/autocomplete_edit_view.h" | 21 #include "chrome/browser/autocomplete/autocomplete_edit_view.h" |
| 21 #include "chrome/browser/autocomplete/autocomplete_match.h" | 22 #include "chrome/browser/autocomplete/autocomplete_match.h" |
| 22 #include "chrome/browser/net/url_fixer_upper.h" | 23 #include "chrome/browser/net/url_fixer_upper.h" |
| (...skipping 496 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 519 [wrenchMenuController_ setModel:wrenchMenuModel_.get()]; | 520 [wrenchMenuController_ setModel:wrenchMenuModel_.get()]; |
| 520 [wrenchMenuController_ setUseWithPopUpButtonCell:YES]; | 521 [wrenchMenuController_ setUseWithPopUpButtonCell:YES]; |
| 521 [wrenchButton_ setAttachedMenu:[wrenchMenuController_ menu]]; | 522 [wrenchButton_ setAttachedMenu:[wrenchMenuController_ menu]]; |
| 522 } | 523 } |
| 523 | 524 |
| 524 - (WrenchMenuController*)wrenchMenuController { | 525 - (WrenchMenuController*)wrenchMenuController { |
| 525 return wrenchMenuController_; | 526 return wrenchMenuController_; |
| 526 } | 527 } |
| 527 | 528 |
| 528 - (void)badgeWrenchMenu { | 529 - (void)badgeWrenchMenu { |
| 529 // In the Windows version, the ball doesn't actually pulsate, and is always | 530 NSImage* badge = ResourceBundle::GetSharedInstance().GetNativeImageNamed( |
| 530 // drawn with the inactive image. Why? (We follow suit, though not on the | 531 IDR_UPDATE_BADGE); |
| 531 // weird positioning they do that overlaps the button border.) | |
| 532 NSImage* badge = nsimage_cache::ImageNamed(@"upgrade_dot.pdf"); | |
| 533 NSImage* wrenchImage = nsimage_cache::ImageNamed(kWrenchButtonImageName); | 532 NSImage* wrenchImage = nsimage_cache::ImageNamed(kWrenchButtonImageName); |
| 534 NSSize wrenchImageSize = [wrenchImage size]; | 533 NSSize wrenchImageSize = [wrenchImage size]; |
| 535 | 534 |
| 536 scoped_nsobject<NSImage> overlayImage( | 535 scoped_nsobject<NSImage> overlayImage( |
| 537 [[NSImage alloc] initWithSize:wrenchImageSize]); | 536 [[NSImage alloc] initWithSize:wrenchImageSize]); |
| 538 | 537 |
| 539 [overlayImage lockFocus]; | 538 [overlayImage lockFocus]; |
| 540 [badge drawAtPoint:NSZeroPoint | 539 [badge drawAtPoint:NSZeroPoint |
| 541 fromRect:NSZeroRect | 540 fromRect:NSZeroRect |
| 542 operation:NSCompositeSourceOver | 541 operation:NSCompositeSourceOver |
| (...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 764 - (void)indicateDropURLsInView:(NSView*)view at:(NSPoint)point { | 763 - (void)indicateDropURLsInView:(NSView*)view at:(NSPoint)point { |
| 765 // Do nothing. | 764 // Do nothing. |
| 766 } | 765 } |
| 767 | 766 |
| 768 // (URLDropTargetController protocol) | 767 // (URLDropTargetController protocol) |
| 769 - (void)hideDropURLsIndicatorInView:(NSView*)view { | 768 - (void)hideDropURLsIndicatorInView:(NSView*)view { |
| 770 // Do nothing. | 769 // Do nothing. |
| 771 } | 770 } |
| 772 | 771 |
| 773 @end | 772 @end |
| OLD | NEW |