Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1999)

Unified Diff: chrome/browser/instant/instant_controller_delegate.h

Issue 10836031: Remove Instant v1 API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Build fix Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/instant/instant_controller_delegate.h
diff --git a/chrome/browser/instant/instant_controller_delegate.h b/chrome/browser/instant/instant_controller_delegate.h
index 306cd079e7ffd8be694bdd05156287e8580630dd..908dd7e746ceffc6bcdf79ccc2f6871439699f1d 100644
--- a/chrome/browser/instant/instant_controller_delegate.h
+++ b/chrome/browser/instant/instant_controller_delegate.h
@@ -14,22 +14,23 @@ namespace gfx {
class Rect;
}
-// |InstantController| calls these methods on its delegate (usually |Browser|)
-// to ask for the Instant preview to be shown, hidden, etc. In the following
-// methods, if a |TabContents| argument is explicitly supplied, the delegate
-// MUST use it. Otherwise, the preview TabContents can be gotten by calling
-// |InstantController::GetPreviewContents| (note that it may return NULL).
+// InstantController calls these methods on its delegate (Browser, via
+// BrowserInstantController) to ask for the Instant preview to be shown,
+// hidden, etc. In the following methods, if a TabContents argument is
+// explicitly supplied, the delegate MUST use it. Otherwise, the preview
+// TabContents can be gotten by calling InstantController::GetPreviewContents()
+// (note that it may return NULL).
class InstantControllerDelegate {
public:
// Show the preview.
- virtual void ShowInstant(TabContents* preview_contents) = 0;
+ virtual void ShowInstant() = 0;
// Hide any preview currently being shown.
virtual void HideInstant() = 0;
- // Commit the preview by merging it into the active tab. Delegate takes
- // ownership of |preview_contents|.
- virtual void CommitInstant(TabContents* preview_contents) = 0;
+ // Commit the |preview| by merging it into the active tab. Delegate takes
+ // ownership of |preview|.
+ virtual void CommitInstant(TabContents* preview) = 0;
// Autocomplete the Instant suggested |text| into the omnibox, using the
// specified |behavior| (see instant_types.h for details).
@@ -44,7 +45,7 @@ class InstantControllerDelegate {
virtual void InstantPreviewFocused() = 0;
// Return the currently active tab, over which any preview would be shown.
- virtual TabContents* GetInstantHostTabContents() const = 0;
+ virtual TabContents* GetActiveTabContents() const = 0;
protected:
virtual ~InstantControllerDelegate() {}

Powered by Google App Engine
This is Rietveld 408576698