Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1351)

Unified Diff: chrome/browser/ui/cocoa/location_bar/search_token_decoration.mm

Issue 12042002: Alternate NTP: Add search token to omnibox (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: update separator color Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/location_bar/search_token_decoration.mm
diff --git a/chrome/browser/ui/cocoa/location_bar/search_token_decoration.mm b/chrome/browser/ui/cocoa/location_bar/search_token_decoration.mm
new file mode 100644
index 0000000000000000000000000000000000000000..15e1bb9a12d81e5249d685c8ad72cecfe11ee9f5
--- /dev/null
+++ b/chrome/browser/ui/cocoa/location_bar/search_token_decoration.mm
@@ -0,0 +1,48 @@
+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "chrome/browser/ui/cocoa/location_bar/search_token_decoration.h"
+
+#import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
+#include "grit/generated_resources.h"
+#include "ui/base/l10n/l10n_util_mac.h"
+
+SearchTokenDecoration::SearchTokenDecoration() {
+}
+
+SearchTokenDecoration::~SearchTokenDecoration() {
+}
+
+void SearchTokenDecoration::DrawInFrame(NSRect frame, NSView* control_view) {
+ NSRect text_rect = NSInsetRect(frame, 0, kTextYInset);
+ [GetAttributedString() drawInRect:text_rect];
+}
+
+CGFloat SearchTokenDecoration::GetWidthForSpace(CGFloat width,
+ CGFloat text_width) {
+ // Padding between the control's text and the search token.
+ const CGFloat kAutoCollapsePadding = 20.0;
+
+ CGFloat desired_width = [GetAttributedString() size].width;
+ if (desired_width > width)
+ return kOmittedWidth;
+
+ // Collapse if the omnibox text would overlap the search token.
+ CGFloat remaining_width = width - desired_width - kAutoCollapsePadding;
+ if (remaining_width < text_width)
+ return kOmittedWidth;
+
+ return desired_width;
+}
+
+NSAttributedString* SearchTokenDecoration::GetAttributedString() const {
+ NSDictionary* attributes = [NSDictionary dictionaryWithObjectsAndKeys:
+ OmniboxViewMac::GetFieldFont(), NSFontAttributeName,
+ OmniboxViewMac::SuggestTextColor(), NSForegroundColorAttributeName,
+ nil];
+ NSString* string = l10n_util::GetNSStringF(IDS_OMNIBOX_SEARCH_TOKEN_TEXT,
+ search_provider_name_);
+ return [[[NSAttributedString alloc] initWithString:string
+ attributes:attributes] autorelease];
+}

Powered by Google App Engine
This is Rietveld 408576698