TEST ONLY - DO NOT SUBMIT - FOR TRYBOTS

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 220 matching lines @@
     // 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 (chrome::ShouldDisplayOriginChip() ||
-      OmniboxFieldTrial::DisplayHintTextWhenPossible()) {
+  if (OmniboxFieldTrial::DisplayHintTextWhenPossible()) {

[Justin Donnelly, 2014/12/03 16:07:25]

It's probably worth double-checking that this field trial still works after your
change. I can't see how it wouldn't, the logic is trivial. But still.

[groby-ooo-7-16, 2015/01/10 00:54:06]

DisplayHintText was introduced as part of origin chip, and is, AFAICT, not used
by anything else. I'll remove hint text as well, but if it's OK with you, a
separate CL after this landed. This is getting large :)

Filed as http://crbug.com/447809

     NSDictionary* placeholder_attributes = @{
       NSFontAttributeName : GetFieldFont(gfx::Font::NORMAL),
       NSForegroundColorAttributeName : [NSColor disabledControlTextColor]
     };
     base::scoped_nsobject<NSMutableAttributedString> placeholder_text(
         [[NSMutableAttributedString alloc]
             initWithString:base::SysUTF16ToNSString(GetHintText())
                 attributes:placeholder_attributes]);
     [[field_ cell] setPlaceholderAttributedString:placeholder_text];
   }
@@ skipping 576 matching lines @@
       }
     }
   }
 
   return false;
 }
 
 void OmniboxViewMac::OnSetFocus(bool control_down) {
   model()->OnSetFocus(control_down);
   controller()->OnSetFocus();
-
-  HandleOriginChipMouseRelease();
 }
 
 void OmniboxViewMac::OnKillFocus() {
   // Tell the model to reset itself.
   model()->OnWillKillFocus();
   model()->OnKillFocus();
-
-  OnDidKillFocus();
 }
 
 void OmniboxViewMac::OnMouseDown(NSInteger button_number) {
   // Restore caret visibility whenever the user clicks in the the omnibox. This
   // is not always covered by OnSetFocus() because when clicking while the
   // omnibox has invisible focus does not trigger a new OnSetFocus() call.
   if (button_number == 0 || button_number == 1)
     model()->SetCaretVisibility(true);
 }
 
@@ skipping 166 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();
 }