InstantExtended: Committed NTP

chrome/browser/instant/instant_overlay.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_INSTANT_INSTANT_LOADER_H_
-#define CHROME_BROWSER_INSTANT_INSTANT_LOADER_H_
+#ifndef CHROME_BROWSER_INSTANT_INSTANT_OVERLAY_H_
+#define CHROME_BROWSER_INSTANT_INSTANT_OVERLAY_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/instant/instant_client.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 struct InstantAutocompleteResult;
 class InstantController;
+class Profile;
 struct ThemeBackgroundInfo;
 
 namespace chrome {
 namespace search {
 struct Mode;
 }
 }
 
 namespace content {
 class WebContents;
 }
 
 namespace gfx {
 class Rect;
 }
 
-// InstantLoader is used to communicate with a preview WebContents that it owns
+// InstantOverlay is used to communicate with a preview WebContents that it owns
 // and loads the "Instant URL" into. This preview can appear and disappear at
 // will as the user types in the omnibox (compare: InstantTab, which talks to a
 // committed tab on the tab strip).
-class InstantLoader : public InstantClient::Delegate,
-                      public content::NotificationObserver {
+class InstantOverlay : public InstantClient::Delegate,
+                       public content::NotificationObserver {
  public:
-  // Returns the Instant loader for |contents| if it's used for Instant.
-  static InstantLoader* FromWebContents(const content::WebContents* contents);
+  // Returns the Instant overlay for |contents| if it's used for Instant.
+  static InstantOverlay* FromWebContents(const content::WebContents* contents);
 
   // Doesn't take ownership of |controller|.
-  InstantLoader(InstantController* controller, const std::string& instant_url);
-  virtual ~InstantLoader();
+  InstantOverlay(InstantController* controller, const std::string& instant_url);
+  virtual ~InstantOverlay();
 
-  // The preview WebContents. InstantLoader retains ownership. This will be
+  // The preview WebContents. InstantOverlay retains ownership. This will be
   // non-NULL after InitFromContents(), and until ReleaseContents() is called.
   content::WebContents* contents() const { return contents_.get(); }
 
-  // Creates a new WebContents and loads |instant_url_| into it. |active_tab| is
-  // the page the preview will be shown on top of and potentially replace.
-  void InitContents(const content::WebContents* active_tab);
+  // Creates a new WebContents and loads |instant_url_| into it. Uses
+  // |active_tab|, if non-NULL, to initialize the size of the WebContents.
+  void InitContents(Profile* profile,
+                    const content::WebContents* active_tab);
 
   // Releases the preview WebContents passing ownership to the caller. This
   // should be called when the preview is committed.
   content::WebContents* ReleaseContents() WARN_UNUSED_RESULT;
 
   // Returns the URL that we're loading.
   const std::string& instant_url() const { return instant_url_; }
 
   // Returns true if the preview is known to support the Instant API. This
   // starts out false, and becomes true whenever we get any message from the
@@ skipping 10 matching lines @@
   // Returns info about the last navigation by the Instant page. If the page
   // hasn't navigated since the last Update(), the URL is empty.
   const history::HistoryAddPageArgs& last_navigation() const {
     return last_navigation_;
   }
 
   // Called by the history tab helper with information that it would have added
   // to the history service had this WebContents not been used for Instant.
   void DidNavigate(const history::HistoryAddPageArgs& add_page_args);
 
-  // Returns true if the loader is using
+  // Returns true if the overlay is using
   // InstantController::kLocalOmniboxPopupURL as the |instant_url_|.
   bool IsUsingLocalPreview() const;
 
   // Calls through to methods of the same name on InstantClient.
   void Update(const string16& text,
               size_t selection_start,
               size_t selection_end,
               bool verbatim);
   void Submit(const string16& text);
   void Cancel(const string16& text);
@@ skipping 44 matching lines @@
   scoped_ptr<content::WebContents> contents_;
 
   const std::string instant_url_;
   bool supports_instant_;
   bool is_pointer_down_from_activate_;
   history::HistoryAddPageArgs last_navigation_;
 
   // Used to get notifications about renderers coming and going.
   content::NotificationRegistrar registrar_;
 
-  DISALLOW_COPY_AND_ASSIGN(InstantLoader);
+  DISALLOW_COPY_AND_ASSIGN(InstantOverlay);
 };
 
-#endif  // CHROME_BROWSER_INSTANT_INSTANT_LOADER_H_
+#endif  // CHROME_BROWSER_INSTANT_INSTANT_OVERLAY_H_