Instant: Use only one hidden WebContents per profile.

chrome/browser/ui/cocoa/browser_window_controller_private.mm

 // Copyright (c) 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.
 
 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h"
 
 #include <cmath>
 
 #include "base/command_line.h"
 #import "base/memory/scoped_nsobject.h"
@@ skipping 10 matching lines @@
 #import "chrome/browser/ui/cocoa/fast_resize_view.h"
 #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h"
 #import "chrome/browser/ui/cocoa/floating_bar_backing_view.h"
 #import "chrome/browser/ui/cocoa/framed_browser_window.h"
 #import "chrome/browser/ui/cocoa/fullscreen_window.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
 #include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h"
 #import "chrome/browser/ui/cocoa/nsview_additions.h"
 #import "chrome/browser/ui/cocoa/presentation_mode_controller.h"
 #import "chrome/browser/ui/cocoa/status_bubble_mac.h"
-#import "chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller.h"
+#import "chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h"
 #include "chrome/browser/ui/search/search_model.h"
 #include "chrome/browser/ui/search/search_ui.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/render_widget_host_view.h"
@@ skipping 20 matching lines @@
 const CGFloat kLocBarLeftRightInset = 1;
 const CGFloat kLocBarTopInset = 0;
 const CGFloat kLocBarBottomInset = 1;
 
 }  // namespace
 
 @implementation BrowserWindowController(Private)
 
 // Create the tab strip controller.
 - (void)createTabStripController {
-  DCHECK([previewableContentsController_ activeContainer]);
-  DCHECK([[previewableContentsController_ activeContainer] window]);
+  DCHECK([overlayableContentsController_ activeContainer]);
+  DCHECK([[overlayableContentsController_ activeContainer] window]);
   tabStripController_.reset([[TabStripController alloc]
       initWithView:[self tabStripView]
-        switchView:[previewableContentsController_ activeContainer]
+        switchView:[overlayableContentsController_ activeContainer]
            browser:browser_.get()
           delegate:self]);
 }
 
 - (void)saveWindowPositionIfNeeded {
   if (!chrome::ShouldSaveWindowPlacement(browser_.get()))
     return;
 
   // If we're in fullscreen mode, save the position of the regular window
   // instead.
@@ skipping 786 matching lines @@
 - (CGFloat)toolbarDividerOpacity {
   if ([self isShowingInstantResults])
     return 1;
   return [bookmarkBarController_ toolbarDividerOpacity];
 }
 
 - (BOOL)isShowingInstantResults {
   if (!browser_->search_model()->mode().is_search_suggestions())
     return NO;
 
-  // If the search suggestions are already being displayed in the preview
+  // If the search suggestions are already being displayed in the overlay
   // contents then return YES.
-  if ([previewableContentsController_ isShowingPreview])
+  if ([overlayableContentsController_ isShowingOverlay])
     return YES;
 
   // Search suggestions might be shown directly in the web contents in some
   // cases.
   return !browser_->search_model()->mode().is_origin_default();
 }
 
 - (void)updateContentOffsets {
   // Normally the tab contents sits below the bookmark bar. This is achieved by
   // setting the offset to the height of the bookmark bar. The only exception
-  // is on the search results page where the instant results are shown inside
-  // the page and not in the preview contents as usual.
+  // is on the search results page where the Instant results are shown inside
+  // the page and not in the overlay contents as usual.
   CGFloat tabContentsOffset = toolbarToWebContentsOffset_;
   if (browser_->search_model()->mode().is_search_suggestions() &&
       !browser_->search_model()->mode().is_origin_default()) {
     tabContentsOffset = 0;
   }
-  [previewableContentsController_ setActiveContainerOffset:tabContentsOffset];
+  [overlayableContentsController_ setActiveContainerOffset:tabContentsOffset];
 
   // Prevent the fast resize view from drawing white over the bookmark bar.
   [[self tabContentArea] setContentOffset:toolbarToWebContentsOffset_];
 
   // Prevent the dev tools splitter from overlapping the bookmark bar.
   if ([self isShowingInstantResults])
     [devToolsController_ setTopContentOffset:0];
   else
     [devToolsController_ setTopContentOffset:toolbarToWebContentsOffset_];
 }
@@ skipping 11 matching lines @@
   } else {
     // Toolbar is below tab contents so that the infobar arrow can appear above
     // it.  Unlike other views the toolbar never overlaps the actual web
     // content.
     [contentView cr_ensureSubview:toolbarView
                      isPositioned:NSWindowBelow
                        relativeTo:[self tabContentArea]];
   }
 
   // The bookmark bar is always below the toolbar. In normal mode this means
-  // that it is below tab contents. This allows instant results to be above
+  // that it is below tab contents. This allows Instant results to be above
   // the bookmark bar.
   [contentView cr_ensureSubview:[bookmarkBarController_ view]
                    isPositioned:NSWindowBelow
                      relativeTo:toolbarView];
 
   if (inPresentationMode) {
     // In presentation mode the infobar is below all other views.
     [contentView cr_ensureSubview:[infoBarContainerController_ view]
                      isPositioned:NSWindowBelow
                        relativeTo:[self tabContentArea]];
   } else {
     // Above the toolbar but still below tab contents. Similar to the bookmark
-    // bar, this allows instant results to be above the info bar.
+    // bar, this allows Instant results to be above the info bar.
     [contentView cr_ensureSubview:[infoBarContainerController_ view]
                      isPositioned:NSWindowAbove
                        relativeTo:toolbarView];
   }
 
-  // The find bar is above everything except instant search results.
+  // The find bar is above everything except Instant search results.
   if (findBarCocoaController_) {
     NSView* relativeView = nil;
     if (inPresentationMode)
       relativeView =  toolbarView;
     else if ([self isShowingInstantResults])
       relativeView = [infoBarContainerController_ view];
     else
       relativeView = [self tabContentArea];
     [contentView cr_ensureSubview:[findBarCocoaController_ view]
                      isPositioned:NSWindowAbove
                        relativeTo:relativeView];
   }
 
   if (floatingBarBackingView_) {
     if ([floatingBarBackingView_ cr_isBelowView:[self tabContentArea]])
       [floatingBarBackingView_ removeFromSuperview];
     if ([self placeBookmarkBarBelowInfoBar]) {
       [contentView cr_ensureSubview:floatingBarBackingView_
                        isPositioned:NSWindowAbove
                          relativeTo:[bookmarkBarController_ view]];
     } else {
       [contentView cr_ensureSubview:floatingBarBackingView_
                        isPositioned:NSWindowBelow
                          relativeTo:[bookmarkBarController_ view]];
     }
   }
 }
 
 @end  // @implementation BrowserWindowController(Private)