Instant: Rename 'preview' to 'overlay'

chrome/browser/ui/browser_instant_controller.cc

 // 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.
 
 #include "chrome/browser/ui/browser_instant_controller.h"
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_web_ui.h"
 #include "chrome/browser/prefs/pref_registry_syncable.h"
@@ skipping 164 matching lines @@
 
   return instant_.CommitIfPossible(disposition == CURRENT_TAB ?
       INSTANT_COMMIT_PRESSED_ENTER : INSTANT_COMMIT_PRESSED_ALT_ENTER);
 }
 
 Profile* BrowserInstantController::profile() const {
   return browser_->profile();
 }
 
 void BrowserInstantController::CommitInstant(
-    scoped_ptr<content::WebContents> preview,
+    scoped_ptr<content::WebContents> overlay,
     bool in_new_tab) {
-  if (profile()->GetExtensionService()->IsInstalledApp(preview->GetURL())) {
+  if (profile()->GetExtensionService()->IsInstalledApp(overlay->GetURL())) {
     AppLauncherHandler::RecordAppLaunchType(
         extension_misc::APP_LAUNCH_OMNIBOX_INSTANT);
   }
   if (in_new_tab) {
-    // TabStripModel takes ownership of |preview|.
-    browser_->tab_strip_model()->AddWebContents(preview.release(), -1,
+    // TabStripModel takes ownership of |overlay|.
+    browser_->tab_strip_model()->AddWebContents(overlay.release(), -1,
         instant_.last_transition_type(), TabStripModel::ADD_ACTIVE);
   } else {
     ReplaceWebContentsAt(
         browser_->tab_strip_model()->active_index(),
-        preview.Pass());
+        overlay.Pass());
   }
 }
 
 void BrowserInstantController::ReplaceWebContentsAt(
     int index,
     scoped_ptr<content::WebContents> new_contents) {
   DCHECK_NE(TabStripModel::kNoTab, index);
   scoped_ptr<content::WebContents> old_contents(browser_->tab_strip_model()->
       ReplaceWebContentsAt(index, new_contents.release()));
   instant_unload_handler_.RunUnloadListenersOrDestroy(old_contents.Pass(),
                                                       index);
 }
 
 void BrowserInstantController::SetInstantSuggestion(
     const InstantSuggestion& suggestion) {
   browser_->window()->GetLocationBar()->SetInstantSuggestion(suggestion);
 }
 
 void BrowserInstantController::CommitSuggestedText(
     bool skip_inline_autocomplete) {
   browser_->window()->GetLocationBar()->GetLocationEntry()->model()->
       CommitSuggestedText(skip_inline_autocomplete);
 }
 
 gfx::Rect BrowserInstantController::GetInstantBounds() {
   return browser_->window()->GetInstantBounds();
 }
 
-void BrowserInstantController::InstantPreviewFocused() {
+void BrowserInstantController::InstantOverlayFocused() {
   // NOTE: This is only invoked on aura.
-  browser_->window()->WebContentsFocused(instant_.GetPreviewContents());
+  browser_->window()->WebContentsFocused(instant_.GetOverlayContents());
 }
 
 void BrowserInstantController::FocusOmniboxInvisibly() {
   OmniboxView* omnibox_view = browser_->window()->GetLocationBar()->
       GetLocationEntry();
   omnibox_view->SetFocus();
   omnibox_view->model()->SetCaretVisibility(false);
 }
 
 content::WebContents* BrowserInstantController::GetActiveWebContents() const {
@@ skipping 27 matching lines @@
                                            transition,
                                            false));
 }
 
 void BrowserInstantController::SetOmniboxBounds(const gfx::Rect& bounds) {
   instant_.SetOmniboxBounds(bounds);
 }
 
 void BrowserInstantController::ResetInstant() {
   bool instant_enabled = IsInstantEnabled(profile());
-  bool use_local_preview_only = profile()->IsOffTheRecord() ||
+  bool use_local_overlay_only = profile()->IsOffTheRecord() ||
       (!instant_enabled &&
        !profile()->GetPrefs()->GetBoolean(prefs::kSearchSuggestEnabled));
-  instant_.SetInstantEnabled(instant_enabled, use_local_preview_only);
+  instant_.SetInstantEnabled(instant_enabled, use_local_overlay_only);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserInstantController, search::SearchModelObserver implementation:
 
 void BrowserInstantController::ModeChanged(const search::Mode& old_mode,
                                            const search::Mode& new_mode) {
-  // If mode is now |NTP|, send theme-related information to instant.
+  // If mode is now |NTP|, send theme-related information to Instant.
   if (new_mode.is_ntp())
     UpdateThemeInfo(false);
 
   instant_.SearchModeChanged(old_mode, new_mode);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserInstantController, content::NotificationObserver implementation:
 
 void BrowserInstantController::Observe(
@@ skipping 81 matching lines @@
     initialized_theme_info_ = true;
   }
 
   DCHECK(initialized_theme_info_);
 
   if (browser_->search_model()->mode().is_ntp())
     instant_.ThemeChanged(theme_info_);
 }
 
 }  // namespace chrome