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

Unified Diff: chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc

Issue 30323002: [DRAFT] Create RenderFrameHostManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 1 month 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 | « no previous file | chrome/browser/extensions/api/web_navigation/web_navigation_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc
diff --git a/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc b/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc
index aca20fbd4ec55bc3d8be7d58ff028c3f1d9cd6fb..153780a4005ac9b3b7452b92278fe9859cc019d6 100644
--- a/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc
+++ b/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc
@@ -159,7 +159,8 @@ void FrameNavigationState::StopTrackingFramesInRVH(
void FrameNavigationState::UpdateFrame(FrameID frame_id, const GURL& url) {
FrameIdToStateMap::iterator frame_state = frame_state_map_.find(frame_id);
if (frame_state == frame_state_map_.end()) {
- NOTREACHED();
+ // TODO(creis): Diagnose.
+ //NOTREACHED();
return;
}
frame_state->second.url = url;
@@ -175,7 +176,8 @@ GURL FrameNavigationState::GetUrl(FrameID frame_id) const {
FrameIdToStateMap::const_iterator frame_state =
frame_state_map_.find(frame_id);
if (frame_state == frame_state_map_.end()) {
- NOTREACHED();
+ // TODO(creis): Diagnose.
+ //NOTREACHED();
return GURL();
}
if (frame_state->second.is_iframe_srcdoc)
@@ -243,7 +245,10 @@ bool FrameNavigationState::GetParsingFinished(FrameID frame_id) const {
}
void FrameNavigationState::SetNavigationCommitted(FrameID frame_id) {
- DCHECK(frame_state_map_.find(frame_id) != frame_state_map_.end());
+ // TODO(creis): Diagnose.
+ if (frame_state_map_.find(frame_id) == frame_state_map_.end())
+ return;
+ //DCHECK(frame_state_map_.find(frame_id) != frame_state_map_.end());
frame_state_map_[frame_id].is_committed = true;
if (frame_state_map_[frame_id].is_main_frame)
main_frame_id_ = frame_id;
« no previous file with comments | « no previous file | chrome/browser/extensions/api/web_navigation/web_navigation_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698