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

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

Issue 11094047: InstantExtended: Add js api for custom logo. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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/instant/instant_controller.h ('k') | chrome/browser/instant/instant_controller_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/instant/instant_controller.cc
diff --git a/chrome/browser/instant/instant_controller.cc b/chrome/browser/instant/instant_controller.cc
index 55272bfe0081b6ce2eb431fb14810415a384e6b9..513349919d922634b27c35272da440999b1439ad 100644
--- a/chrome/browser/instant/instant_controller.cc
+++ b/chrome/browser/instant/instant_controller.cc
@@ -550,6 +550,15 @@ void InstantController::SetSuggestions(
Show(100, INSTANT_SIZE_PERCENT);
}
+void InstantController::SetHasCustomLogo(InstantLoader* loader,
+ bool has_logo) {
+ if (loader_ != loader || mode_ != EXTENDED ||
+ (IsOutOfDate() && !active_tab_is_ntp_))
sreeram 2012/10/10 18:57:04 Don't do the IsOutOfDate or active_tab_is_ntp_ che
Jered 2012/10/10 22:10:48 Done.
+ return;
+
+ delegate_->SetHasCustomLogo(has_logo);
+}
+
void InstantController::CommitInstantLoader(InstantLoader* loader) {
if (loader_ != loader || !is_showing_ || IsOutOfDate())
return;
« no previous file with comments | « chrome/browser/instant/instant_controller.h ('k') | chrome/browser/instant/instant_controller_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698