InstantExtended: Remove overlay control code.

chrome/browser/ui/omnibox/omnibox_edit_model.h

 // Copyright 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_OMNIBOX_OMNIBOX_EDIT_MODEL_H_
 #define CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_EDIT_MODEL_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 279 matching lines @@
   // may be false when the user is composing a text with an IME.
   bool OnAfterPossibleChange(const string16& old_text,
                              const string16& new_text,
                              size_t selection_start,
                              size_t selection_end,
                              bool selection_differs,
                              bool text_differs,
                              bool just_deleted_text,
                              bool allow_keyword_ui_change);
 
-  // TODO(beaudoin): Mac code still calls this here. We should try to untangle
-  // this.
-  // Invoked when the popup has changed its bounds to |bounds|. |bounds| here
-  // is in screen coordinates.
-  void OnPopupBoundsChanged(const gfx::Rect& bounds) {
-    omnibox_controller_->OnPopupBoundsChanged(bounds);
-  }
-
   // Called when the current match has changed in the OmniboxController.
   void OnCurrentMatchChanged(bool is_temporary_set_by_instant);

[Peter Kasting, 2013/06/28 18:47:55]

This function is now never called with its arg set to |true|.  Should that arg,
and |is_temporary_text_set_by_instant_|, be nuked?

[Jered, 2013/06/28 19:09:55]

Done.

 
   // Callend when the gray text suggestion has changed in the OmniboxController.
   void OnGrayTextChanged();

[Peter Kasting, 2013/06/28 18:47:55]

This function now has no callers, should it be deleted?

[Jered, 2013/06/28 19:09:55]

Done.

 
   // Access the current view text.
   string16 GetViewText() const;
 
   string16 user_text() const { return user_text_; }
 
   // TODO(beaudoin): We need this to allow OmniboxController access the
   // InstantController via OmniboxEditController, because the only valid pointer
   // to InstantController is kept in Browser. We should try to get rid of this,
   // maybe by ensuring InstantController lives as long as Browser.
@@ skipping 173 matching lines @@
   // due to the user arrowing up/down through the popup. This can only be true
   // if |has_temporary_text_| is true.
   // TODO(sreeram): This is a temporary hack. Remove it once the omnibox edit
   // model/view code is decoupled from Instant (among other things).
   bool is_temporary_text_set_by_instant_;
 
   // The index of the selected AutocompleteMatch in AutocompleteResult. This is
   // needed to get the metadata details of the temporary text set by instant on
   // the Local NTP. If the Instant extended is disabled or an Instant NTP is
   // used, this is set to OmniboxPopupModel::kNoMatch.
   size_t selected_instant_autocomplete_match_index_;

[Peter Kasting, 2013/06/28 18:47:55]

AFAICT, this variable and the next are never true.  These should probably be
nuked.

[Jered, 2013/06/28 19:09:55]

Done.

 
   // True if the current temporary text set by Instant is a search query; false
   // if it is a URL that can be directly navigated to. This is only valid if
   // |is_temporary_text_set_by_instant_| is true. This field is needed because
   // Instant's temporary text doesn't come from the popup model, so we can't
   // lookup its type from the current match.
   bool is_instant_temporary_text_a_search_query_;
 
   // When the user's last action was to paste, we disallow inline autocomplete
   // (on the theory that the user is trying to paste in a new URL or part of
@@ skipping 44 matching lines @@
   // an exact keyword match.  If this is true then keyword mode will be
   // triggered automatically if the input is "<keyword> <search string>".  We
   // allow this when CreatedKeywordSearchByInsertingSpaceInMiddle() is true.
   // This has no effect if we're already in keyword mode.
   bool allow_exact_keyword_match_;
 
   DISALLOW_COPY_AND_ASSIGN(OmniboxEditModel);
 };
 
 #endif  // CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_EDIT_MODEL_H_