Move most visited item state info from InstantController to InstantService.

chrome/browser/ui/search/instant_controller.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_SEARCH_INSTANT_CONTROLLER_H_
 #define CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_
 
 #include <list>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/time.h"
 #include "base/timer.h"
-#include "chrome/browser/history/history_types.h"
 #include "chrome/browser/ui/omnibox/omnibox_edit_model.h"
 #include "chrome/browser/ui/search/instant_commit_type.h"
 #include "chrome/browser/ui/search/instant_overlay_model.h"
 #include "chrome/browser/ui/search/instant_page.h"
 #include "chrome/common/instant_types.h"
 #include "chrome/common/omnibox_focus_state.h"
 #include "chrome/common/search_types.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
 #include "content/public/common/page_transition_types.h"
 #include "googleurl/src/gurl.h"
 #include "ui/base/window_open_disposition.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/rect.h"
 
 struct AutocompleteMatch;
 struct InstantAutocompleteResult;
 
 class AutocompleteProvider;
@@ skipping 23 matching lines @@
 //      swapped-in the next time the user navigates to the New Tab Page. It is
 //      never shown to the user in an uncommitted state.
 //  (3) An InstantTab instance which points to the currently active tab, if it
 //      supports the Embedded Search API.
 //
 // All three are backed by a WebContents. InstantOverlay and InstantNTP own
 // their corresponding WebContents; InstantTab does not. In non-extended mode,
 // only an InstantOverlay instance is kept.
 //
 // InstantController is owned by Browser via BrowserInstantController.
-class InstantController : public InstantPage::Delegate,
-                          public content::NotificationObserver {
+class InstantController : public InstantPage::Delegate {
  public:
   InstantController(BrowserInstantController* browser,
                     bool extended_enabled);
   virtual ~InstantController();
 
   // Called when the Autocomplete flow is about to start. Sets up the
   // appropriate page to send user updates to.  May reset |instant_tab_| or
   // switch to a local fallback |overlay_| as necessary.
   void OnAutocompleteStart();
 
@@ skipping 122 matching lines @@
 
   // Returns the transition type of the last AutocompleteMatch passed to Update.
   content::PageTransition last_transition_type() const {
     return last_transition_type_;
   }
 
   // Non-const for Add/RemoveObserver only.  Other model changes should only
   // happen through the InstantController interface.
   InstantOverlayModel* model() { return &model_; }
 
+  // Sends a collection of MostVisitedItems to the renderer process via
+  // the appropriate InstantPage subclass.
+  void SendMostVisitedItems(
+      const std::vector<InstantMostVisitedItemIDPair>& items);
+
  private:
   friend class InstantTestBase;
   FRIEND_TEST_ALL_PREFIXES(InstantTest, OmniboxFocusLoadsInstant);
   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, UsesOverlayIfTabNotReady);
   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest,
                            SearchQueryNotDisplayedForNavsuggest);
   FRIEND_TEST_ALL_PREFIXES(InstantTest, SetWithTemplateURL);
   FRIEND_TEST_ALL_PREFIXES(InstantTest, NonInstantSearchProvider);
   FRIEND_TEST_ALL_PREFIXES(InstantTest, InstantOverlayRefresh);
   FRIEND_TEST_ALL_PREFIXES(InstantTest, InstantOverlayRefreshDifferentOrder);
@@ skipping 34 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, OnDefaultSearchProviderChanged);
   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, SearchProviderForLocalNTP);
   FRIEND_TEST_ALL_PREFIXES(
       InstantExtendedFirstTabTest, RedirectToLocalOnLoadFailure);
 
   Profile* profile() const;
   InstantOverlay* overlay() const;
   InstantTab* instant_tab() const;
   InstantNTP* ntp() const;
 
-  // Overridden from content::NotificationObserver:
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
-
   // Overridden from InstantPage::Delegate:
   // TODO(shishir): We assume that the WebContent's current RenderViewHost is
   // the RenderViewHost being created which is not always true. Fix this.
   virtual void InstantPageRenderViewCreated(
       const content::WebContents* contents) OVERRIDE;
   virtual void InstantSupportDetermined(
       const content::WebContents* contents,
       bool supports_instant) OVERRIDE;
   virtual void InstantPageRenderViewGone(
       const content::WebContents* contents) OVERRIDE;
@@ skipping 11 matching lines @@
                             OmniboxFocusState state) OVERRIDE;
   virtual void NavigateToURL(
       const content::WebContents* contents,
       const GURL& url,
       content::PageTransition transition,
       WindowOpenDisposition disposition) OVERRIDE;
   virtual void InstantPageLoadFailed(content::WebContents* contents) OVERRIDE;
 
   // Invoked by the InstantLoader when the Instant page wants to delete a
   // Most Visited item.
-  virtual void DeleteMostVisitedItem(InstantRestrictedID most_visited_item_id)
-      OVERRIDE;
+  virtual void DeleteMostVisitedItem(const GURL& item_url) OVERRIDE;
 
   // Invoked by the InstantLoader when the Instant page wants to undo a
   // Most Visited deletion.
-  virtual void UndoMostVisitedDeletion(InstantRestrictedID most_visited_item_id)
+  virtual void UndoMostVisitedDeletion(const GURL& most_visited_item_url)
       OVERRIDE;
 
   // Invoked by the InstantLoader when the Instant page wants to undo all
   // Most Visited deletions.
   virtual void UndoAllMostVisitedDeletions() OVERRIDE;
 
   // Helper function to navigate the given contents to the local fallback
   // Instant URL and trim the history correctly.
   void RedirectToLocalNTP(content::WebContents* contents);
 
@@ skipping 47 matching lines @@
   // unless you are going to call overlay_.reset() yourself subsequently.
   void HideInternal();
 
   // Counterpart to HideOverlay(). Asks the |browser_| to display the overlay
   // with the given |height| in |units|.
   void ShowOverlay(int height, InstantSizeUnits units);
 
   // Send the omnibox popup bounds to the page.
   void SendPopupBoundsToPage();
 
-  // Begin listening to change notifications from TopSites and fire off an
-  // initial request for most visited items.
-  void StartListeningToMostVisitedChanges();
-
-  // Fire off an async request for most visited items to the TopNav code.
-  void RequestMostVisitedItems();
-
-  // Called when we get new most visited items from the TopNav code,
-  // registered as an async callback.  Parses them and sends them to the
-  // renderer via SendMostVisitedItems.
-  void OnMostVisitedItemsReceived(const history::MostVisitedURLList& data);
-
-  // Sends a collection of MostVisitedItems to the renderer process via
-  // the appropriate InstantPage subclass.
-  void SendMostVisitedItems(
-      const std::vector<InstantMostVisitedItemIDPair>& items);
+  // Gets the Most Visited items info from InstantService and forwards them to
+  // the Instant page renderer.
+  void UpdateMostVisitedItemsInfo();
 
   // If possible, tries to mutate |suggestion| to a valid suggestion. Returns
   // true if successful. (Note that |suggestion| may be modified even if this
   // returns false.)
   bool FixSuggestion(InstantSuggestion* suggestion) const;
 
   // Returns true if the local page is being used.
   bool UsingLocalPage() const;
 
   // Returns true iff |use_tab_for_suggestions_| is true and |instant_tab_|
@@ skipping 100 matching lines @@
   base::Time first_interaction_time_;
 
   // Whether to allow the overlay to show search suggestions. In general, the
   // overlay is allowed to show search suggestions whenever |search_mode_| is
   // MODE_SEARCH_SUGGESTIONS, except in those cases where this is false.
   bool allow_overlay_to_show_search_suggestions_;
 
   // List of events and their timestamps, useful in debugging Instant behaviour.
   mutable std::list<std::pair<int64, std::string> > debug_events_;
 
-  // Used for Top Sites async retrieval.
-  base::WeakPtrFactory<InstantController> weak_ptr_factory_;
-
-  // Used to get notifications about Most Visted changes.
-  content::NotificationRegistrar registrar_;
-
   DISALLOW_COPY_AND_ASSIGN(InstantController);
 };
 
 #endif  // CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_