Omnibox: Remove Hint Text Code

chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
 
 #include <Carbon/Carbon.h>  // kVK_Return
 
 #include "base/mac/foundation_util.h"
 #include "base/metrics/histogram.h"
@@ skipping 196 matching lines @@
     [[field_ currentEditor] setSelectedRange:state->selection];
 #endif
   }
 }
 
 void OmniboxViewMac::ResetTabState(WebContents* web_contents) {
   StoreStateToTab(web_contents, nullptr);
 }
 
 void OmniboxViewMac::Update() {
-  UpdatePlaceholderText();
-
   if (model()->UpdatePermanentText()) {
     // Something visibly changed.  Re-enable URL replacement.
     controller()->GetToolbarModel()->set_url_replacement_enabled(true);
     model()->UpdatePermanentText();
 
     // Restore everything to the baseline look.
     RevertAll();
 
     // TODO(shess): Figure out how this case is used, to make sure
     // we're getting the selection and popup right.
   } else {
     // TODO(shess): This corresponds to _win and _gtk, except those
     // guard it with a test for whether the security level changed.
     // But AFAICT, that can only change if the text changed, and that
     // code compares the toolbar model security level with the local
     // security level.  Dig in and figure out why this isn't a no-op
     // that should go away.
     EmphasizeURLComponents();
   }
 }
 
-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,
                                const base::string16& pasted_text,
                                size_t selected_line) {
   // Coalesce text and selection updates from the following function. If we
   // don't do this, the user may see intermediate states as brief flickers.
   in_coalesced_update_block_ = true;
   OmniboxView::OpenMatch(
       match, disposition, alternate_nav_url, pasted_text, selected_line);
@@ skipping 760 matching lines @@
 
 NSUInteger OmniboxViewMac::GetTextLength() const {
   return [field_ currentEditor] ?  [[[field_ currentEditor] string] length] :
                                    [[field_ stringValue] length];
 }
 
 bool OmniboxViewMac::IsCaretAtEnd() const {
   const NSRange selection = GetSelectedRange();
   return NSMaxRange(selection) == GetTextLength();
 }