diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-18 15:49:33 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-18 15:49:33 +0000 |
| commit | df84e51c34d4240614114fe9811aedbab5f9d7d6 (patch) | |
| tree | d3e947c5fba70d8e5e411452b0455382def3248c | |
| parent | c3755ce2812f19d5573155841a99fa2031a9e83f (diff) | |
| download | chromium_src-df84e51c34d4240614114fe9811aedbab5f9d7d6.zip chromium_src-df84e51c34d4240614114fe9811aedbab5f9d7d6.tar.gz chromium_src-df84e51c34d4240614114fe9811aedbab5f9d7d6.tar.bz2 | |
[Mac] Remove the yellow ball and replace it with a green arrow thing.
BUG=65742
TEST=Wait to be out-of-date (or uncomment some code in upgrade_detector.cc) and run with --check-for-update-interval=5. See green icon on Wrench menu button that matches the one in the menu.
Review URL: http://codereview.chromium.org/6048001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69648 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/app/theme/upgrade_dot.pdf | bin | 4672 -> 0 bytes | |||
| -rw-r--r-- | chrome/browser/ui/cocoa/toolbar_controller.mm | 7 | ||||
| -rw-r--r-- | chrome/chrome_dll.gypi | 1 |
3 files changed, 3 insertions, 5 deletions
diff --git a/chrome/app/theme/upgrade_dot.pdf b/chrome/app/theme/upgrade_dot.pdf Binary files differdeleted file mode 100644 index 27c54a9..0000000 --- a/chrome/app/theme/upgrade_dot.pdf +++ /dev/null diff --git a/chrome/browser/ui/cocoa/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar_controller.mm index 586bf784..663d3db 100644 --- a/chrome/browser/ui/cocoa/toolbar_controller.mm +++ b/chrome/browser/ui/cocoa/toolbar_controller.mm @@ -10,6 +10,7 @@ #include "app/l10n_util_mac.h" #include "app/menus/accelerator_cocoa.h" #include "app/menus/menu_model.h" +#include "app/resource_bundle.h" #include "base/mac_util.h" #include "base/nsimage_cache_mac.h" #include "base/singleton.h" @@ -526,10 +527,8 @@ class NotificationBridge : public NotificationObserver { } - (void)badgeWrenchMenu { - // In the Windows version, the ball doesn't actually pulsate, and is always - // drawn with the inactive image. Why? (We follow suit, though not on the - // weird positioning they do that overlaps the button border.) - NSImage* badge = nsimage_cache::ImageNamed(@"upgrade_dot.pdf"); + NSImage* badge = ResourceBundle::GetSharedInstance().GetNativeImageNamed( + IDR_UPDATE_BADGE); NSImage* wrenchImage = nsimage_cache::ImageNamed(kWrenchButtonImageName); NSSize wrenchImageSize = [wrenchImage size]; diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index 1efbd39..267382f 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -280,7 +280,6 @@ 'app/theme/star_lit.pdf', 'app/theme/stop_Template.pdf', 'app/theme/tools_Template.pdf', - 'app/theme/upgrade_dot.pdf', 'browser/ui/cocoa/install.sh', ], 'mac_bundle_resources!': [ |