summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-22 07:04:10 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-22 07:04:10 +0000
commit8cfe1ad1e52b2145dc8962bd48518fa2728c1be8 (patch)
treea108c3944521de33bcf28193426c70567f0b7915 /chrome/browser
parent8667535e4fe61d9498b2116df065cc33adb67edd (diff)
downloadchromium_src-8cfe1ad1e52b2145dc8962bd48518fa2728c1be8.zip
chromium_src-8cfe1ad1e52b2145dc8962bd48518fa2728c1be8.tar.gz
chromium_src-8cfe1ad1e52b2145dc8962bd48518fa2728c1be8.tar.bz2
Mac: minor cleanup of constants in toolbar_controller.mm.
BUG=none TEST=none Review URL: http://codereview.chromium.org/418049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32779 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/cocoa/toolbar_controller.mm28
1 files changed, 16 insertions, 12 deletions
diff --git a/chrome/browser/cocoa/toolbar_controller.mm b/chrome/browser/cocoa/toolbar_controller.mm
index 6617c87..97f693b 100644
--- a/chrome/browser/cocoa/toolbar_controller.mm
+++ b/chrome/browser/cocoa/toolbar_controller.mm
@@ -32,20 +32,24 @@
#include "chrome/common/pref_service.h"
#include "grit/generated_resources.h"
+namespace {
+
// Names of images in the bundle for buttons.
-static NSString* const kBackButtonImageName = @"back_Template.pdf";
-static NSString* const kForwardButtonImageName = @"forward_Template.pdf";
-static NSString* const kReloadButtonImageName = @"reload_Template.pdf";
-static NSString* const kHomeButtonImageName = @"home_Template.pdf";
-static NSString* const kStarButtonImageName = @"star_Template.pdf";
-static NSString* const kStarButtonFillingImageName = @"starred.pdf";
-static NSString* const kGoButtonGoImageName = @"go_Template.pdf";
-static NSString* const kGoButtonStopImageName = @"stop_Template.pdf";
-static NSString* const kPageButtonImageName = @"menu_page_Template.pdf";
-static NSString* const kWrenchButtonImageName = @"menu_chrome_Template.pdf";
+NSString* const kBackButtonImageName = @"back_Template.pdf";
+NSString* const kForwardButtonImageName = @"forward_Template.pdf";
+NSString* const kReloadButtonImageName = @"reload_Template.pdf";
+NSString* const kHomeButtonImageName = @"home_Template.pdf";
+NSString* const kStarButtonImageName = @"star_Template.pdf";
+NSString* const kStarButtonFillingImageName = @"starred.pdf";
+NSString* const kGoButtonGoImageName = @"go_Template.pdf";
+NSString* const kGoButtonStopImageName = @"stop_Template.pdf";
+NSString* const kPageButtonImageName = @"menu_page_Template.pdf";
+NSString* const kWrenchButtonImageName = @"menu_chrome_Template.pdf";
// Height of the toolbar in pixels when the bookmark bar is closed.
-static const float kBaseToolbarHeight = 36.0;
+const CGFloat kBaseToolbarHeight = 36.0;
+
+} // namespace
@interface ToolbarController(Private)
- (void)initCommandStatus:(CommandUpdater*)commands;
@@ -518,7 +522,7 @@ class PrefObserverBridge : public NotificationObserver {
}
- (CGFloat)desiredHeightForCompression:(CGFloat)compressByHeight {
- return kBaseToolbarHeight - compressByHeight;
+ return kBaseToolbarHeight - compressByHeight;
}
- (void)setDividerOpacity:(CGFloat)opacity {