InstantExtended: Committed NTP

chrome/browser/ui/browser_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_BROWSER_INSTANT_CONTROLLER_H_
 #define CHROME_BROWSER_UI_BROWSER_INSTANT_CONTROLLER_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/prefs/public/pref_change_registrar.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/instant/instant_unload_handler.h"
+#include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/search/search_model_observer.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "webkit/glue/window_open_disposition.h"
 
 class Browser;
 struct InstantSuggestion;
 class PrefServiceSyncable;
 class Profile;
 class ThemeService;
@@ skipping 13 matching lines @@
  public:
   explicit BrowserInstantController(Browser* browser);
   virtual ~BrowserInstantController();
 
   // Returns true if Instant is enabled in a visible, preview-showing mode.
   static bool IsInstantEnabled(Profile* profile);
 
   // Registers Instant related preferences.
   static void RegisterUserPrefs(PrefServiceSyncable* prefs);
 
+  // If |url| is the new tab page URL, set |target_contents| to the preloaded
+  // NTP contents from InstantController. If |source_contents| is not NULL, we
+  // replace it with the new |target_contents| in the tabstrip and delete
+  // |source_contents|. Returns true if and only if we update |target_contents|.
+  bool MaybeSwapInInstantContents(const GURL& url,
+                                  content::WebContents* source_contents,
+                                  content::WebContents** target_contents);
+
   // Commits the current Instant, returning true on success. This is intended
   // for use from OpenCurrentURL.
   bool OpenInstant(WindowOpenDisposition disposition);
 
+  // Returns the Profile associated with the Browser that owns this object.
+  Profile* profile() const { return browser_->profile(); }
+
   // Returns the InstantController or NULL if there is no InstantController for
   // this BrowserInstantController.
   InstantController* instant() { return &instant_; }
 
   // Invoked by |instant_| to commit the |preview| by merging it into the active
   // tab or adding it as a new tab. We take ownership of |preview|.
   void CommitInstant(content::WebContents* preview, bool in_new_tab);
 
   // Invoked by |instant_| to autocomplete the |suggestion| into the omnibox.
   void SetInstantSuggestion(const InstantSuggestion& suggestion);
@@ skipping 46 matching lines @@
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // Helper for handling theme change.
   void OnThemeChanged(ThemeService* theme_service);
 
   // Helper for handling theme area height change.
   void OnThemeAreaHeightChanged(int height);
 
+  // Replaces the contents at tab |index| with |new_contents| and deletes the
+  // existing contents.
+  void ReplaceWebContentsAt(int index, content::WebContents* new_contents);

[dhollowa, 2013/01/22 22:34:58]

scoped_ptr<WebContents> new_contents.

[samarth, 2013/01/25 21:08:40]

Done.

+
   Browser* const browser_;
 
   InstantController instant_;
   InstantUnloadHandler instant_unload_handler_;
 
   // Theme-related data for NTP preview to adopt themes.
   bool initialized_theme_info_;  // True if theme_info_ has been initialized.
   ThemeBackgroundInfo theme_info_;
   int theme_area_height_;
 
   PrefChangeRegistrar profile_pref_registrar_;
 
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserInstantController);
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_UI_BROWSER_INSTANT_CONTROLLER_H_