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

Unified Diff: chrome/browser/instant/instant_controller.cc

Issue 10915217: Hook up SetInstantPreviewHeight for ChromeOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move height to ShowPreview. Created 8 years, 3 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/instant/instant_controller.cc
diff --git a/chrome/browser/instant/instant_controller.cc b/chrome/browser/instant/instant_controller.cc
index 869c0293123248bbdc986880c17051b1d6508f90..0c2232003052f036496b051e867e9c02cf1374aa 100644
--- a/chrome/browser/instant/instant_controller.cc
+++ b/chrome/browser/instant/instant_controller.cc
@@ -296,6 +296,8 @@ void InstantController::Hide() {
last_active_tab_ = NULL;
if (is_showing_) {
is_showing_ = false;
+ preview_height_ = 100;
+ preview_height_units_ = INSTANT_SIZE_PERCENT;
delegate_->HideInstant();
}
if (GetPreviewContents() && !last_full_text_.empty()) {
@@ -507,6 +509,18 @@ void InstantController::CommitInstantLoader(InstantLoader* loader) {
CommitCurrentPreview(INSTANT_COMMIT_FOCUS_LOST);
}
+void InstantController::SetInstantPreviewHeight(InstantLoader* loader,
+ int height,
+ InstantSizeUnits units) {
+ DCHECK_EQ(loader_.get(), loader);
+ if (loader_ != loader || mode_ != EXTENDED)
+ return;
+
+ preview_height_ = height;
+ preview_height_units_ = units;
+ Show();
+}
+
void InstantController::InstantLoaderPreviewLoaded(InstantLoader* loader) {
DCHECK_EQ(loader_.get(), loader);
AddPreviewUsageForHistogram(mode_, PREVIEW_LOADED);
@@ -539,7 +553,7 @@ void InstantController::InstantSupportDetermined(InstantLoader* loader,
void InstantController::SwappedTabContents(InstantLoader* loader) {
DCHECK_EQ(loader_.get(), loader);
if (loader_ == loader && is_showing_)
- delegate_->ShowInstant();
+ delegate_->ShowInstant(preview_height_, preview_height_units_);
}
void InstantController::InstantLoaderContentsFocused(InstantLoader* loader) {
@@ -562,7 +576,9 @@ InstantController::InstantController(InstantControllerDelegate* delegate,
last_transition_type_(content::PAGE_TRANSITION_LINK),
last_match_was_search_(false),
is_showing_(false),
- loader_processed_last_update_(false) {
+ loader_processed_last_update_(false),
+ preview_height_(100),
+ preview_height_units_(INSTANT_SIZE_PERCENT) {
}
void InstantController::ResetLoader(const std::string& instant_url,
@@ -636,7 +652,7 @@ void InstantController::DeleteLoader() {
void InstantController::Show() {
if (!is_showing_) {
is_showing_ = true;
- delegate_->ShowInstant();
+ delegate_->ShowInstant(preview_height_, preview_height_units_);
AddPreviewUsageForHistogram(mode_, PREVIEW_SHOWED);
}
}

Powered by Google App Engine
This is Rietveld 408576698