| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/renderer/net/net_error_helper.h" | 5 #include "chrome/renderer/net/net_error_helper.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/i18n/rtl.h" | 10 #include "base/i18n/rtl.h" |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 core_.ExecuteButtonPress(NetErrorHelperCore::MORE_BUTTON); | 107 core_.ExecuteButtonPress(NetErrorHelperCore::MORE_BUTTON); |
| 108 } | 108 } |
| 109 | 109 |
| 110 void NetErrorHelper::DidStartProvisionalLoad() { | 110 void NetErrorHelper::DidStartProvisionalLoad() { |
| 111 blink::WebFrame* frame = render_frame()->GetWebFrame(); | 111 blink::WebFrame* frame = render_frame()->GetWebFrame(); |
| 112 core_.OnStartLoad(GetFrameType(frame), GetLoadingPageType(frame)); | 112 core_.OnStartLoad(GetFrameType(frame), GetLoadingPageType(frame)); |
| 113 } | 113 } |
| 114 | 114 |
| 115 void NetErrorHelper::DidCommitProvisionalLoad(bool is_new_navigation) { | 115 void NetErrorHelper::DidCommitProvisionalLoad(bool is_new_navigation) { |
| 116 blink::WebFrame* frame = render_frame()->GetWebFrame(); | 116 blink::WebFrame* frame = render_frame()->GetWebFrame(); |
| 117 core_.OnCommitLoad(GetFrameType(frame)); | 117 GURL url(frame->document().url()); |
| 118 core_.OnCommitLoad(GetFrameType(frame), url); |
| 118 } | 119 } |
| 119 | 120 |
| 120 void NetErrorHelper::DidFinishLoad() { | 121 void NetErrorHelper::DidFinishLoad() { |
| 121 blink::WebFrame* frame = render_frame()->GetWebFrame(); | 122 blink::WebFrame* frame = render_frame()->GetWebFrame(); |
| 122 core_.OnFinishLoad(GetFrameType(frame)); | 123 core_.OnFinishLoad(GetFrameType(frame)); |
| 123 } | 124 } |
| 124 | 125 |
| 125 void NetErrorHelper::OnStop() { | 126 void NetErrorHelper::OnStop() { |
| 126 core_.OnStop(); | 127 core_.OnStop(); |
| 127 } | 128 } |
| (...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 298 if (!response.isNull() && response.httpStatusCode() == 200) { | 299 if (!response.isNull() && response.httpStatusCode() == 200) { |
| 299 core_.OnNavigationCorrectionsFetched( | 300 core_.OnNavigationCorrectionsFetched( |
| 300 data, render_frame()->GetRenderView()->GetAcceptLanguages(), | 301 data, render_frame()->GetRenderView()->GetAcceptLanguages(), |
| 301 LocaleIsRTL()); | 302 LocaleIsRTL()); |
| 302 } else { | 303 } else { |
| 303 core_.OnNavigationCorrectionsFetched( | 304 core_.OnNavigationCorrectionsFetched( |
| 304 "", render_frame()->GetRenderView()->GetAcceptLanguages(), | 305 "", render_frame()->GetRenderView()->GetAcceptLanguages(), |
| 305 LocaleIsRTL()); | 306 LocaleIsRTL()); |
| 306 } | 307 } |
| 307 } | 308 } |
| OLD | NEW |