summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-03 01:38:25 +0000
committersail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-03 01:38:25 +0000
commitac8a8299a1123f7d2c9b9cd54b8f88fd26d946cb (patch)
tree4b79b621ddeceaaef7ca96f7f2dbf945a5369ea5
parent49c71ac612c2ef64bea0adbbc20ec7c4199f87a8 (diff)
downloadchromium_src-ac8a8299a1123f7d2c9b9cd54b8f88fd26d946cb.zip
chromium_src-ac8a8299a1123f7d2c9b9cd54b8f88fd26d946cb.tar.gz
chromium_src-ac8a8299a1123f7d2c9b9cd54b8f88fd26d946cb.tar.bz2
Instant Extended: Use 15pt font in search decorations on Mac
This CL changes omnibox decorations from 13pt Lucida Grande to 15pt Helvetica. Screenshots with my change: - Instant Extended disabled: -- http://i.imgur.com/G4tC91c.png -- http://i.imgur.com/3udAmUp.png -- http://i.imgur.com/3fxt3S4.png - Instant Extended enabled: -- http://i.imgur.com/OdiQSKa.png -- http://i.imgur.com/OKkso4Z.png -- http://i.imgur.com/CbQSM77.png BUG=231005 TEST=Enable instant extended. Type bing.com and press enter. Verify that the search decoraiton font size is correct. R=shess@chromium.org Review URL: https://codereview.chromium.org/14448003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198028 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/ui/cocoa/location_bar/location_bar_decoration.mm3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_decoration.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_decoration.mm
index b1c6d21..de2bc3c 100644
--- a/chrome/browser/ui/cocoa/location_bar/location_bar_decoration.mm
+++ b/chrome/browser/ui/cocoa/location_bar/location_bar_decoration.mm
@@ -6,6 +6,7 @@
#include "base/logging.h"
#include "base/memory/scoped_nsobject.h"
+#include "chrome/browser/search/search.h"
#include "ui/base/resource/resource_bundle.h"
const CGFloat LocationBarDecoration::kOmittedWidth = 0.0;
@@ -69,6 +70,8 @@ NSMenu* LocationBarDecoration::GetMenu() {
}
NSFont* LocationBarDecoration::GetFont() const {
+ if (chrome::IsInstantExtendedAPIEnabled())
+ return [NSFont fontWithName:@"Helvetica" size:15];
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
return rb.GetFont(ResourceBundle::BaseFont).GetNativeFont();
}