| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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/prerender/prerender_handle.h" | 5 #include "chrome/browser/prerender/prerender_handle.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "chrome/browser/prerender/prerender_contents.h" | 10 #include "chrome/browser/prerender/prerender_contents.h" |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 return prerender_data_ != NULL; | 45 return prerender_data_ != NULL; |
| 46 } | 46 } |
| 47 | 47 |
| 48 bool PrerenderHandle::IsFinishedLoading() const { | 48 bool PrerenderHandle::IsFinishedLoading() const { |
| 49 DCHECK(CalledOnValidThread()); | 49 DCHECK(CalledOnValidThread()); |
| 50 if (!prerender_data_) | 50 if (!prerender_data_) |
| 51 return false; | 51 return false; |
| 52 return prerender_data_->contents()->has_finished_loading(); | 52 return prerender_data_->contents()->has_finished_loading(); |
| 53 } | 53 } |
| 54 | 54 |
| 55 bool PrerenderHandle::Matches( |
| 56 const GURL& url, |
| 57 const content::SessionStorageNamespace* session_storage_namespace) const { |
| 58 DCHECK(CalledOnValidThread()); |
| 59 if (!prerender_data_) |
| 60 return false; |
| 61 return prerender_data_->contents()->Matches(url, session_storage_namespace); |
| 62 } |
| 63 |
| 55 PrerenderHandle::PrerenderHandle( | 64 PrerenderHandle::PrerenderHandle( |
| 56 PrerenderManager::PrerenderData* prerender_data) | 65 PrerenderManager::PrerenderData* prerender_data) |
| 57 : observer_(NULL), | 66 : observer_(NULL), |
| 58 weak_ptr_factory_(this) { | 67 weak_ptr_factory_(this) { |
| 59 if (prerender_data) { | 68 if (prerender_data) { |
| 60 prerender_data_ = prerender_data->AsWeakPtr(); | 69 prerender_data_ = prerender_data->AsWeakPtr(); |
| 61 prerender_data->OnHandleCreated(this); | 70 prerender_data->OnHandleCreated(this); |
| 62 } | 71 } |
| 63 } | 72 } |
| 64 | 73 |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 123 // so we expect to not have our new contents in our PrerenderData yet. The | 132 // so we expect to not have our new contents in our PrerenderData yet. The |
| 124 // switch occurs in | 133 // switch occurs in |
| 125 // PrerenderManager::PrerenderData::MakeIntoMatchCompleteReplacement, so | 134 // PrerenderManager::PrerenderData::MakeIntoMatchCompleteReplacement, so |
| 126 // this method only needs to switch observing. | 135 // this method only needs to switch observing. |
| 127 | 136 |
| 128 contents->RemoveObserver(this); | 137 contents->RemoveObserver(this); |
| 129 replacement->AddObserver(this); | 138 replacement->AddObserver(this); |
| 130 } | 139 } |
| 131 | 140 |
| 132 } // namespace prerender | 141 } // namespace prerender |
| OLD | NEW |