| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/search/instant_overlay_model.h" | 5 #include "chrome/browser/ui/search/instant_overlay_model.h" |
| 6 | 6 |
| 7 #include "chrome/browser/ui/search/instant_controller.h" | 7 #include "chrome/browser/ui/search/instant_controller.h" |
| 8 #include "chrome/browser/ui/search/instant_overlay_model_observer.h" | 8 #include "chrome/browser/ui/search/instant_overlay_model_observer.h" |
| 9 | 9 |
| 10 InstantOverlayModel::InstantOverlayModel(InstantController* controller) | 10 InstantOverlayModel::InstantOverlayModel(InstantController* controller) |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 if (overlay_contents_ == overlay_contents) | 43 if (overlay_contents_ == overlay_contents) |
| 44 return; | 44 return; |
| 45 | 45 |
| 46 overlay_contents_ = overlay_contents; | 46 overlay_contents_ = overlay_contents; |
| 47 | 47 |
| 48 FOR_EACH_OBSERVER(InstantOverlayModelObserver, observers_, | 48 FOR_EACH_OBSERVER(InstantOverlayModelObserver, observers_, |
| 49 OverlayStateChanged(*this)); | 49 OverlayStateChanged(*this)); |
| 50 } | 50 } |
| 51 | 51 |
| 52 content::WebContents* InstantOverlayModel::GetOverlayContents() const { | 52 content::WebContents* InstantOverlayModel::GetOverlayContents() const { |
| 53 // |controller_| maybe NULL durning tests. | |
| 54 if (controller_) | |
| 55 return controller_->GetOverlayContents(); | |
| 56 return overlay_contents_; | 53 return overlay_contents_; |
| 57 } | 54 } |
| 58 | 55 |
| 59 void InstantOverlayModel::AddObserver(InstantOverlayModelObserver* observer) { | 56 void InstantOverlayModel::AddObserver(InstantOverlayModelObserver* observer) { |
| 60 observers_.AddObserver(observer); | 57 observers_.AddObserver(observer); |
| 61 } | 58 } |
| 62 | 59 |
| 63 void InstantOverlayModel::RemoveObserver( | 60 void InstantOverlayModel::RemoveObserver( |
| 64 InstantOverlayModelObserver* observer) { | 61 InstantOverlayModelObserver* observer) { |
| 65 observers_.RemoveObserver(observer); | 62 observers_.RemoveObserver(observer); |
| 66 } | 63 } |
| OLD | NEW |