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

Unified Diff: chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm

Issue 1100763002: Inject CanAddURLToHistory into TopSitesImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@prefs
Patch Set: Fix error introduced during rebase Created 5 years, 8 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/omnibox/omnibox_view_mac.mm
diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm
index 66a1bc232f001c016b118512bb833eb1192f8859..d4aebcc0dd4736295f3f9f5222d27df9836fa7f4 100644
--- a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm
+++ b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm
@@ -214,8 +214,6 @@ void OmniboxViewMac::ResetTabState(WebContents* web_contents) {
}
void OmniboxViewMac::Update() {
- UpdatePlaceholderText();
-
if (model()->UpdatePermanentText()) {
// Something visibly changed. Re-enable URL replacement.
controller()->GetToolbarModel()->set_url_replacement_enabled(true);
@@ -237,20 +235,6 @@ void OmniboxViewMac::Update() {
}
}
-void OmniboxViewMac::UpdatePlaceholderText() {
- if (OmniboxFieldTrial::DisplayHintTextWhenPossible()) {
- NSDictionary* placeholder_attributes = @{
- NSForegroundColorAttributeName : [NSColor disabledControlTextColor]
- };
- base::scoped_nsobject<NSMutableAttributedString> placeholder_text(
- [[NSMutableAttributedString alloc]
- initWithString:base::SysUTF16ToNSString(GetHintText())
- attributes:placeholder_attributes]);
- ApplyTextStyle(placeholder_text);
- [[field_ cell] setPlaceholderAttributedString:placeholder_text];
- }
-}
-
void OmniboxViewMac::OpenMatch(const AutocompleteMatch& match,
WindowOpenDisposition disposition,
const GURL& alternate_nav_url,

Powered by Google App Engine
This is Rietveld 408576698