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/extensions/api/web_navigation/frame_navigation_state.h" | 5 #include "chrome/browser/extensions/api/web_navigation/frame_navigation_state.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "chrome/common/url_constants.h" | 8 #include "chrome/common/url_constants.h" |
9 #include "extensions/common/constants.h" | 9 #include "extensions/common/constants.h" |
10 | 10 |
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
152 if (frame_id == main_frame_id_) | 152 if (frame_id == main_frame_id_) |
153 main_frame_id_ = FrameID(); | 153 main_frame_id_ = FrameID(); |
154 frame_state_map_.erase(frame_id); | 154 frame_state_map_.erase(frame_id); |
155 frame_ids_.erase(frame_id); | 155 frame_ids_.erase(frame_id); |
156 } | 156 } |
157 } | 157 } |
158 | 158 |
159 void FrameNavigationState::UpdateFrame(FrameID frame_id, const GURL& url) { | 159 void FrameNavigationState::UpdateFrame(FrameID frame_id, const GURL& url) { |
160 FrameIdToStateMap::iterator frame_state = frame_state_map_.find(frame_id); | 160 FrameIdToStateMap::iterator frame_state = frame_state_map_.find(frame_id); |
161 if (frame_state == frame_state_map_.end()) { | 161 if (frame_state == frame_state_map_.end()) { |
162 NOTREACHED(); | 162 // TODO(creis): Diagnose. |
| 163 //NOTREACHED(); |
163 return; | 164 return; |
164 } | 165 } |
165 frame_state->second.url = url; | 166 frame_state->second.url = url; |
166 } | 167 } |
167 | 168 |
168 bool FrameNavigationState::IsValidFrame(FrameID frame_id) const { | 169 bool FrameNavigationState::IsValidFrame(FrameID frame_id) const { |
169 FrameIdToStateMap::const_iterator frame_state = | 170 FrameIdToStateMap::const_iterator frame_state = |
170 frame_state_map_.find(frame_id); | 171 frame_state_map_.find(frame_id); |
171 return (frame_state != frame_state_map_.end()); | 172 return (frame_state != frame_state_map_.end()); |
172 } | 173 } |
173 | 174 |
174 GURL FrameNavigationState::GetUrl(FrameID frame_id) const { | 175 GURL FrameNavigationState::GetUrl(FrameID frame_id) const { |
175 FrameIdToStateMap::const_iterator frame_state = | 176 FrameIdToStateMap::const_iterator frame_state = |
176 frame_state_map_.find(frame_id); | 177 frame_state_map_.find(frame_id); |
177 if (frame_state == frame_state_map_.end()) { | 178 if (frame_state == frame_state_map_.end()) { |
178 NOTREACHED(); | 179 // TODO(creis): Diagnose. |
| 180 //NOTREACHED(); |
179 return GURL(); | 181 return GURL(); |
180 } | 182 } |
181 if (frame_state->second.is_iframe_srcdoc) | 183 if (frame_state->second.is_iframe_srcdoc) |
182 return GURL(content::kAboutSrcDocURL); | 184 return GURL(content::kAboutSrcDocURL); |
183 return frame_state->second.url; | 185 return frame_state->second.url; |
184 } | 186 } |
185 | 187 |
186 bool FrameNavigationState::IsMainFrame(FrameID frame_id) const { | 188 bool FrameNavigationState::IsMainFrame(FrameID frame_id) const { |
187 FrameIdToStateMap::const_iterator frame_state = | 189 FrameIdToStateMap::const_iterator frame_state = |
188 frame_state_map_.find(frame_id); | 190 frame_state_map_.find(frame_id); |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
236 } | 238 } |
237 | 239 |
238 bool FrameNavigationState::GetParsingFinished(FrameID frame_id) const { | 240 bool FrameNavigationState::GetParsingFinished(FrameID frame_id) const { |
239 FrameIdToStateMap::const_iterator frame_state = | 241 FrameIdToStateMap::const_iterator frame_state = |
240 frame_state_map_.find(frame_id); | 242 frame_state_map_.find(frame_id); |
241 return (frame_state == frame_state_map_.end() || | 243 return (frame_state == frame_state_map_.end() || |
242 !frame_state->second.is_parsing); | 244 !frame_state->second.is_parsing); |
243 } | 245 } |
244 | 246 |
245 void FrameNavigationState::SetNavigationCommitted(FrameID frame_id) { | 247 void FrameNavigationState::SetNavigationCommitted(FrameID frame_id) { |
246 DCHECK(frame_state_map_.find(frame_id) != frame_state_map_.end()); | 248 // TODO(creis): Diagnose. |
| 249 if (frame_state_map_.find(frame_id) == frame_state_map_.end()) |
| 250 return; |
| 251 //DCHECK(frame_state_map_.find(frame_id) != frame_state_map_.end()); |
247 frame_state_map_[frame_id].is_committed = true; | 252 frame_state_map_[frame_id].is_committed = true; |
248 if (frame_state_map_[frame_id].is_main_frame) | 253 if (frame_state_map_[frame_id].is_main_frame) |
249 main_frame_id_ = frame_id; | 254 main_frame_id_ = frame_id; |
250 } | 255 } |
251 | 256 |
252 bool FrameNavigationState::GetNavigationCommitted(FrameID frame_id) const { | 257 bool FrameNavigationState::GetNavigationCommitted(FrameID frame_id) const { |
253 FrameIdToStateMap::const_iterator frame_state = | 258 FrameIdToStateMap::const_iterator frame_state = |
254 frame_state_map_.find(frame_id); | 259 frame_state_map_.find(frame_id); |
255 return (frame_state != frame_state_map_.end() && | 260 return (frame_state != frame_state_map_.end() && |
256 frame_state->second.is_committed); | 261 frame_state->second.is_committed); |
257 } | 262 } |
258 | 263 |
259 void FrameNavigationState::SetIsServerRedirected(FrameID frame_id) { | 264 void FrameNavigationState::SetIsServerRedirected(FrameID frame_id) { |
260 DCHECK(frame_state_map_.find(frame_id) != frame_state_map_.end()); | 265 DCHECK(frame_state_map_.find(frame_id) != frame_state_map_.end()); |
261 frame_state_map_[frame_id].is_server_redirected = true; | 266 frame_state_map_[frame_id].is_server_redirected = true; |
262 } | 267 } |
263 | 268 |
264 bool FrameNavigationState::GetIsServerRedirected(FrameID frame_id) const { | 269 bool FrameNavigationState::GetIsServerRedirected(FrameID frame_id) const { |
265 FrameIdToStateMap::const_iterator frame_state = | 270 FrameIdToStateMap::const_iterator frame_state = |
266 frame_state_map_.find(frame_id); | 271 frame_state_map_.find(frame_id); |
267 return (frame_state != frame_state_map_.end() && | 272 return (frame_state != frame_state_map_.end() && |
268 frame_state->second.is_server_redirected); | 273 frame_state->second.is_server_redirected); |
269 } | 274 } |
270 | 275 |
271 } // namespace extensions | 276 } // namespace extensions |
OLD | NEW |