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

Unified Diff: chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.mm

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
Index: chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.mm
diff --git a/chrome/browser/ui/cocoa/tab_contents/instant_preview_controller_mac.mm b/chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.mm
similarity index 57%
rename from chrome/browser/ui/cocoa/tab_contents/instant_preview_controller_mac.mm
rename to chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.mm
index 356178d7bc8f3172490f75a2292cb3e59249b54d..059b05d14a47acbdbf8b6885e55bb4daee8304b4 100644
--- a/chrome/browser/ui/cocoa/tab_contents/instant_preview_controller_mac.mm
+++ b/chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.mm
@@ -2,43 +2,42 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/ui/cocoa/tab_contents/instant_preview_controller_mac.h"
-
-#include "chrome/browser/instant/instant_model.h"
+#include "chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.h"
+#include "chrome/browser/instant/instant_overlay_model.h"
#include "chrome/browser/ui/browser.h"
#import "chrome/browser/ui/cocoa/browser_window_controller.h"
-#import "chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller.h"
+#import "chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h"
-InstantPreviewControllerMac::InstantPreviewControllerMac(
+InstantOverlayControllerMac::InstantOverlayControllerMac(
Browser* browser,
BrowserWindowController* window,
- PreviewableContentsController* preview)
- : InstantPreviewController(browser),
+ OverlayableContentsController* overlay)
+ : InstantOverlayController(browser),
window_(window),
- preview_(preview) {
+ overlay_(overlay) {
}
-InstantPreviewControllerMac::~InstantPreviewControllerMac() {
+InstantOverlayControllerMac::~InstantOverlayControllerMac() {
}
-void InstantPreviewControllerMac::PreviewStateChanged(
- const InstantModel& model) {
+void InstantOverlayControllerMac::OverlayStateChanged(
+ const InstantOverlayModel& model) {
if (model.mode().is_ntp() || model.mode().is_search_suggestions()) {
- // 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 drawDropShadow = !model.mode().is_ntp() &&
!(model.height() == 100 &&
model.height_units() == INSTANT_SIZE_PERCENT);
- [preview_ setPreview:model.GetPreviewContents()
+ [overlay_ setOverlay:model.GetOverlayContents()
height:model.height()
heightUnits:model.height_units()
drawDropShadow:drawDropShadow];
} else {
- [preview_ setPreview:NULL
+ [overlay_ setOverlay:NULL
height:0
heightUnits:INSTANT_SIZE_PIXELS
drawDropShadow:NO];
}
- browser_->MaybeUpdateBookmarkBarStateForInstantPreview(model.mode());
- [window_ updateBookmarkBarStateForInstantPreview];
+ browser_->MaybeUpdateBookmarkBarStateForInstantOverlay(model.mode());
+ [window_ updateBookmarkBarStateForInstantOverlay];
}

Powered by Google App Engine
This is Rietveld 408576698