Minor cosmetic changes to OmniboxEditModel and OmniboxController.

chrome/browser/ui/omnibox/omnibox_controller.h

 // Copyright 2013 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_CONTROLLER_H_
 #define CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_CONTROLLER_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 66 matching lines @@
   void InvalidateCurrentMatch();
 
   void set_popup_model(OmniboxPopupModel* popup_model) {
     popup_ = popup_model;
   }
 
   // TODO(beaudoin): The edit and popup model should be siblings owned by the
   // LocationBarView, making this accessor unnecessary.
   OmniboxPopupModel* popup_model() const { return popup_; }
 
+  const AutocompleteMatch& current_match() const { return current_match_; }
+
   const string16& gray_suggestion() const { return gray_suggestion_; }
 
-  const AutocompleteMatch& CurrentMatch(GURL* alternate_nav_url) const;
-
   // Turns off keyword mode for the current match.
   void ClearPopupKeywordMode() const;
 
   const AutocompleteResult& result() const {
     return autocomplete_controller_->result();
   }
 
   // TODO(beaudoin): Make private once OmniboxEditModel no longer refers to it.
   void DoPreconnect(const AutocompleteMatch& match);
 
@@ skipping 38 matching lines @@
   AutocompleteMatch current_match_;
 
   // The completion suggested by instant, displayed in gray text besides
   // |fill_into_edit|.
   string16 gray_suggestion_;
 
   DISALLOW_COPY_AND_ASSIGN(OmniboxController);
 };
 
 #endif  // CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_CONTROLLER_H_