diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-17 22:15:48 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-17 22:15:48 +0000 |
| commit | 993f4bbe80d1ff637b4df80b77684a3af82e515a (patch) | |
| tree | ac7bf5c081892418c85717b15763f85843295be3 /chrome/renderer/net/net_error_helper.cc | |
| parent | 50c5452dfd05dd0678d4ef4ea188429b1fbbae35 (diff) | |
| download | chromium_src-993f4bbe80d1ff637b4df80b77684a3af82e515a.zip chromium_src-993f4bbe80d1ff637b4df80b77684a3af82e515a.tar.gz chromium_src-993f4bbe80d1ff637b4df80b77684a3af82e515a.tar.bz2 | |
Cleanup: Remove more dead GTK code.
TBR=sky@chromium.org
Review URL: https://codereview.chromium.org/326043002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277881 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/net/net_error_helper.cc')
| -rw-r--r-- | chrome/renderer/net/net_error_helper.cc | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/chrome/renderer/net/net_error_helper.cc b/chrome/renderer/net/net_error_helper.cc index 8012024..315c787 100644 --- a/chrome/renderer/net/net_error_helper.cc +++ b/chrome/renderer/net/net_error_helper.cc @@ -68,18 +68,6 @@ NetErrorHelperCore::FrameType GetFrameType(const blink::WebFrame* frame) { return NetErrorHelperCore::SUB_FRAME; } -// Copied from localized_error.cc. -// TODO(mmenke): Share code? -bool LocaleIsRTL() { -#if defined(TOOLKIT_GTK) - // base::i18n::IsRTL() uses the GTK text direction, which doesn't work within - // the renderer sandbox. - return base::i18n::ICUIsRTL(); -#else - return base::i18n::IsRTL(); -#endif -} - } // namespace NetErrorHelper::NetErrorHelper(RenderFrame* render_frame) @@ -342,15 +330,11 @@ void NetErrorHelper::OnNavigationCorrectionsFetched( // it to a temporary to prevent any potential re-entrancy issues. scoped_ptr<content::ResourceFetcher> fetcher( correction_fetcher_.release()); - if (!response.isNull() && response.httpStatusCode() == 200) { - core_->OnNavigationCorrectionsFetched( - data, render_frame()->GetRenderView()->GetAcceptLanguages(), - LocaleIsRTL()); - } else { - core_->OnNavigationCorrectionsFetched( - "", render_frame()->GetRenderView()->GetAcceptLanguages(), - LocaleIsRTL()); - } + bool success = (!response.isNull() && response.httpStatusCode() == 200); + core_->OnNavigationCorrectionsFetched( + success ? data : "", + render_frame()->GetRenderView()->GetAcceptLanguages(), + base::i18n::IsRTL()); } void NetErrorHelper::OnTrackingRequestComplete( |