Make the OmniboxNavigationObserver update the ShortcutsProvider.

chrome/browser/ui/omnibox/omnibox_navigation_observer.h

Index: chrome/browser/ui/omnibox/omnibox_navigation_observer.h
===================================================================
--- chrome/browser/ui/omnibox/omnibox_navigation_observer.h	(revision 228523)
+++ chrome/browser/ui/omnibox/omnibox_navigation_observer.h	(working copy)
@@ -7,7 +7,9 @@
 
 #include <string>
 
+#include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_observer.h"
@@ -14,8 +16,8 @@
 #include "net/url_request/url_fetcher_delegate.h"
 #include "url/gurl.h"
 
-namespace content {
-class NavigationController;
+namespace history {
+class ShortcutsBackend;
 }
 
 namespace net {
@@ -33,7 +35,7 @@
 //     displays an infobar once the search result has also loaded.  See
 //     AlternateNavInfoBarDelegate.
 // (2) Omnibox navigations that complete successfully are added to the
-//     Shortcuts backend.  TODO(pkasting): Not yet implemented.
+//     Shortcuts backend.
 //
 // TODO(pkasting): Probably NOTIFICATION_OMNIBOX_OPENED_URL should disappear and
 // everyone who listened to it should be triggered from this class instead.
@@ -52,11 +54,19 @@
     LOAD_COMMITTED,
   };
 
-  explicit OmniboxNavigationObserver(const GURL& alternate_nav_url);
+  OmniboxNavigationObserver(Profile* profile,
+                            const string16& text,
+                            const AutocompleteMatch& match,
+                            const GURL& alternate_nav_url);
   virtual ~OmniboxNavigationObserver();
 
   LoadState load_state() const { return load_state_; }
 
+  // Called directly by OmniboxEditModel when an extension-related navigation
+  // occurs.  Such navigations don't trigger an immediate NAV_ENTRY_PENDING and
+  // must be handled separately.
+  void OnSuccessfulNavigation();
+
  private:
   enum FetchState {
     FETCH_NOT_COMPLETE,
@@ -85,7 +95,11 @@
   // the alternate nav infobar if necessary, and deletes |this|.
   void OnAllLoadingFinished();
 
-  GURL alternate_nav_url_;
+  const string16 text_;
+  const AutocompleteMatch match_;
+  const GURL alternate_nav_url_;
+  scoped_refptr<history::ShortcutsBackend> shortcuts_backend_;  // May be NULL
+                                                                // in incognito.
   scoped_ptr<net::URLFetcher> fetcher_;
   LoadState load_state_;
   FetchState fetch_state_;