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

Unified Diff: chrome/browser/ui/gtk/instant_overlay_controller_gtk.cc

Issue 12386019: Instant: Use only one hidden WebContents per profile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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/ui/gtk/instant_overlay_controller_gtk.cc
diff --git a/chrome/browser/ui/gtk/instant_preview_controller_gtk.cc b/chrome/browser/ui/gtk/instant_overlay_controller_gtk.cc
similarity index 58%
rename from chrome/browser/ui/gtk/instant_preview_controller_gtk.cc
rename to chrome/browser/ui/gtk/instant_overlay_controller_gtk.cc
index 21e6a6dbc14754bb9ac13042385eb5c6efae3afe..c25b0ee5906f47b90f58aa7ccec7bf38845fe765 100644
--- a/chrome/browser/ui/gtk/instant_preview_controller_gtk.cc
+++ b/chrome/browser/ui/gtk/instant_overlay_controller_gtk.cc
@@ -2,30 +2,30 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/ui/gtk/instant_preview_controller_gtk.h"
+#include "chrome/browser/ui/gtk/instant_overlay_controller_gtk.h"
#include "chrome/browser/instant/instant_model.h"
#include "chrome/browser/ui/gtk/browser_window_gtk.h"
#include "chrome/browser/ui/gtk/tab_contents_container_gtk.h"
-InstantPreviewControllerGtk::InstantPreviewControllerGtk(
+InstantOverlayControllerGtk::InstantOverlayControllerGtk(
BrowserWindowGtk* window,
TabContentsContainerGtk* contents)
- : InstantPreviewController(window->browser()),
+ : InstantOverlayController(window->browser()),
window_(window),
contents_(contents) {
}
-InstantPreviewControllerGtk::~InstantPreviewControllerGtk() {
+InstantOverlayControllerGtk::~InstantOverlayControllerGtk() {
}
-void InstantPreviewControllerGtk::PreviewStateChanged(
+void InstantOverlayControllerGtk::OverlayStateChanged(
const InstantModel& model) {
- if (model.mode().is_search_suggestions()) {
+ if (model.overlay()) {
// TODO(jered): Support non-100% height.
- contents_->SetPreview(model.GetPreviewContents());
+ contents_->SetOverlay(model.overlay());
} else {
- contents_->SetPreview(NULL);
+ contents_->SetOverlay(NULL);
}
window_->MaybeShowBookmarkBar(false);
}

Powered by Google App Engine
This is Rietveld 408576698