Chromium Code Reviews| 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; |