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

Unified Diff: chrome/browser/ui/browser_instant_controller.cc

Issue 12387089: Instant: Rename 'preview' to 'overlay' (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
« no previous file with comments | « chrome/browser/ui/browser_instant_controller.h ('k') | chrome/browser/ui/cocoa/browser_window_cocoa.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser_instant_controller.cc
diff --git a/chrome/browser/ui/browser_instant_controller.cc b/chrome/browser/ui/browser_instant_controller.cc
index 0b69d667f8f68e82ec4bed69e8c2a5016642255f..0eea71a5f0c4b031f22162925f83ae1a1354c53c 100644
--- a/chrome/browser/ui/browser_instant_controller.cc
+++ b/chrome/browser/ui/browser_instant_controller.cc
@@ -182,20 +182,20 @@ Profile* BrowserInstantController::profile() const {
}
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());
}
}
@@ -224,9 +224,9 @@ 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() {
@@ -274,10 +274,10 @@ void BrowserInstantController::SetOmniboxBounds(const gfx::Rect& 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);
}
////////////////////////////////////////////////////////////////////////////////
@@ -285,7 +285,7 @@ void BrowserInstantController::ResetInstant() {
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);
« no previous file with comments | « chrome/browser/ui/browser_instant_controller.h ('k') | chrome/browser/ui/cocoa/browser_window_cocoa.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698