Instant: Rename 'preview' to 'overlay'

chrome/browser/ui/views/frame/instant_overlay_controller_views.cc

Index: chrome/browser/ui/views/frame/instant_overlay_controller_views.cc
diff --git a/chrome/browser/ui/views/frame/instant_preview_controller_views.cc b/chrome/browser/ui/views/frame/instant_overlay_controller_views.cc
similarity index 50%
rename from chrome/browser/ui/views/frame/instant_preview_controller_views.cc
rename to chrome/browser/ui/views/frame/instant_overlay_controller_views.cc
index 742c4be85d26edf5e3bdfa93419a3af6e6f9f5af..ba6a35fe3bfccd58bff2280d9557207a4d5b972d 100644
--- a/chrome/browser/ui/views/frame/instant_preview_controller_views.cc
+++ b/chrome/browser/ui/views/frame/instant_overlay_controller_views.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/views/frame/instant_preview_controller_views.h"
+#include "chrome/browser/ui/views/frame/instant_overlay_controller_views.h"
 
-#include "chrome/browser/instant/instant_model.h"
+#include "chrome/browser/instant/instant_overlay_model.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/view_ids.h"
@@ -13,51 +13,51 @@
 #include "chrome/browser/ui/views/infobars/infobar_container_view.h"
 #include "ui/views/controls/webview/webview.h"
 
-InstantPreviewControllerViews::InstantPreviewControllerViews(
+InstantOverlayControllerViews::InstantOverlayControllerViews(
     Browser* browser,
     ContentsContainer* contents)
-    : InstantPreviewController(browser),
+    : InstantOverlayController(browser),
       contents_(contents) {
 }
 
-InstantPreviewControllerViews::~InstantPreviewControllerViews() {
+InstantOverlayControllerViews::~InstantOverlayControllerViews() {
 }
 
-void InstantPreviewControllerViews::PreviewStateChanged(
-    const InstantModel& model) {
+void InstantOverlayControllerViews::OverlayStateChanged(
+    const InstantOverlayModel& model) {
   if (model.mode().is_ntp() || model.mode().is_search_suggestions()) {
-    // Show the preview.
-    if (!preview_) {
-      preview_.reset(new views::WebView(browser_->profile()));
-      preview_->set_id(VIEW_ID_TAB_CONTAINER);
+    // Show the overlay.
+    if (!overlay_) {
+      overlay_.reset(new views::WebView(browser_->profile()));
+      overlay_->set_id(VIEW_ID_TAB_CONTAINER);
     }
-    // Drop shadow is only needed if search mode is not |NTP| and preview does
+    // Drop shadow is only needed if search mode is not |NTP| and overlay does
     // not fill up the entire contents page.
     bool draw_drop_shadow = !model.mode().is_ntp() &&
-        !(contents_->IsPreviewFullHeight(model.height(), model.height_units()));
-    content::WebContents* web_contents = model.GetPreviewContents();
-    contents_->SetPreview(preview_.get(), web_contents, model.mode(),
+        !(contents_->IsOverlayFullHeight(model.height(), model.height_units()));
+    content::WebContents* web_contents = model.GetOverlayContents();
+    contents_->SetOverlay(overlay_.get(), web_contents, model.mode(),
                           model.height(), model.height_units(),
                           draw_drop_shadow);
-    preview_->SetWebContents(web_contents);
-  } else if (preview_) {
-    // Hide the preview. SetWebContents() must happen before SetPreview().
-    preview_->SetWebContents(NULL);
-    contents_->SetPreview(NULL, NULL, model.mode(), 100, INSTANT_SIZE_PERCENT,
+    overlay_->SetWebContents(web_contents);
+  } else if (overlay_) {
+    // Hide the overlay. SetWebContents() must happen before SetOverlay().
+    overlay_->SetWebContents(NULL);
+    contents_->SetOverlay(NULL, NULL, model.mode(), 100, INSTANT_SIZE_PERCENT,
                           false);
-    preview_.reset();
+    overlay_.reset();
   }
 
-  browser_->MaybeUpdateBookmarkBarStateForInstantPreview(model.mode());
+  browser_->MaybeUpdateBookmarkBarStateForInstantOverlay(model.mode());
 
-  // If an instant preview is added during an immersive mode reveal, the reveal
+  // If an Instant overlay is added during an immersive mode reveal, the reveal
   // view needs to stay on top.
-  // Notify infobar container of change in preview state.
-  if (preview_) {
+  // Notify infobar container of change in overlay state.
+  if (overlay_) {
     BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser_);
     if (browser_view) {
       browser_view->MaybeStackImmersiveRevealAtTop();
-      browser_view->infobar_container()->PreviewStateChanged(model);
+      browser_view->infobar_container()->OverlayStateChanged(model);
     }
   }
 }