From 5471c7aacd182997567ee7ee5c78328b98b933ab Mon Sep 17 00:00:00 2001 From: "rsesek@chromium.org" Date: Mon, 19 Jul 2010 23:50:09 +0000 Subject: [Mac] Minor tweaks to the Wrench menu. * Swap the +/- zoom buttons so that minus is first. * Invert the fullscreen arrows when in fullscreen mode. BUG=49449 TEST=Visual TEST=Wrench menu --> Enter full screen. Wrench menu now has inverted arrows to exit full screen. Review URL: http://codereview.chromium.org/3008010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52963 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/cocoa/wrench_menu_controller.mm | 7 +++++++ chrome/browser/wrench_menu_model.h | 3 +++ 2 files changed, 10 insertions(+) (limited to 'chrome/browser') diff --git a/chrome/browser/cocoa/wrench_menu_controller.mm b/chrome/browser/cocoa/wrench_menu_controller.mm index 0f31548..80ceed9 100644 --- a/chrome/browser/cocoa/wrench_menu_controller.mm +++ b/chrome/browser/cocoa/wrench_menu_controller.mm @@ -7,6 +7,8 @@ #include "app/menus/menu_model.h" #include "base/sys_string_conversions.h" #include "chrome/app/chrome_dll_resource.h" +#include "chrome/browser/browser.h" +#include "chrome/browser/browser_window.h" #import "chrome/browser/cocoa/toolbar_controller.h" #include "chrome/browser/wrench_menu_model.h" @@ -71,6 +73,11 @@ NSString* title = base::SysUTF16ToNSString( [self wrenchMenuModel]->GetLabelForCommandId(IDC_ZOOM_PERCENT_DISPLAY)); [[zoomItem_ viewWithTag:IDC_ZOOM_PERCENT_DISPLAY] setTitle:title]; + + NSImage* icon = [self wrenchMenuModel]->browser()->window()->IsFullscreen() ? + [NSImage imageNamed:NSImageNameExitFullScreenTemplate] : + [NSImage imageNamed:NSImageNameEnterFullScreenTemplate]; + [zoomFullScreen_ setImage:icon]; } // Used to dispatch commands from the Wrench menu. The custom items within the diff --git a/chrome/browser/wrench_menu_model.h b/chrome/browser/wrench_menu_model.h index b7dc724..473888d 100644 --- a/chrome/browser/wrench_menu_model.h +++ b/chrome/browser/wrench_menu_model.h @@ -78,6 +78,9 @@ class WrenchMenuModel : public menus::SimpleMenuModel, const NotificationSource& source, const NotificationDetails& details); + // Getters. + Browser* browser() const { return browser_; } + private: // Testing constructor used for mocking. friend class ::MockWrenchMenuModel; -- cgit v1.1