Revert 120018 - Revert 120005 - Enabled pressing TAB to traverse through the Omnibox results, rem...

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

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
 #ifndef CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_VIEW_MAC_H_
 #define CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_VIEW_MAC_H_
 #pragma once
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 35 matching lines @@
                          size_t index,
                          const string16& keyword) OVERRIDE;
   virtual string16 GetText() const OVERRIDE;
   virtual bool IsEditingOrEmpty() const OVERRIDE;
   virtual int GetIcon() const OVERRIDE;
   virtual void SetUserText(const string16& text) OVERRIDE;
   virtual void SetUserText(const string16& text,
                            const string16& display_text,
                            bool update_popup) OVERRIDE;
   virtual void SetWindowTextAndCaretPos(const string16& text,
-                                        size_t caret_pos) OVERRIDE;
+                                        size_t caret_pos,
+                                        bool update_popup,
+                                        bool notify_text_changed) OVERRIDE;
   virtual void SetForcedQuery() OVERRIDE;
   virtual bool IsSelectAll() OVERRIDE;
   virtual bool DeleteAtEndPressed() OVERRIDE;
   virtual void GetSelectionBounds(string16::size_type* start,
                                   string16::size_type* end) const OVERRIDE;
   virtual void SelectAll(bool reversed) OVERRIDE;
   virtual void RevertAll() OVERRIDE;
   virtual void UpdatePopup() OVERRIDE;
   virtual void ClosePopup() OVERRIDE;
   virtual void SetFocus() OVERRIDE;
@@ skipping 89 matching lines @@
   NSString* GetNonSuggestTextSubstring() const;
 
   // Returns the suggest portion of |field_|'s string value.
   NSString* GetSuggestTextSubstring() const;
 
   // Pass the current content of |field_| to SetText(), maintaining
   // any selection.  Named to be consistent with GTK and Windows,
   // though here we cannot really do the in-place operation they do.
   void EmphasizeURLComponents();
 
+  // Internally invoked whenever the text changes in some way.
+  void TextChanged();
+
   // Calculates text attributes according to |display_text| and applies them
   // to the given |as| object.
   void ApplyTextAttributes(const string16& display_text,
                            NSMutableAttributedString* as);
 
   // Return the number of UTF-16 units in the current buffer, excluding the
   // suggested text.
   NSUInteger GetTextLength() const;
 
   // Places the caret at the given position. This clears any selection.
@@ skipping 34 matching lines @@
   // Was the delete key pressed with an empty selection at the end of the edit?
   bool delete_at_end_pressed_;
 
   // The maximum/standard line height for the displayed text.
   CGFloat line_height_;
 
   DISALLOW_COPY_AND_ASSIGN(OmniboxViewMac);
 };
 
 #endif  // CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_VIEW_MAC_H_