summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-02 21:58:04 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-02 21:58:04 +0000
commit1482a09d841f71aed1cdf0130bfd5180d8a835c0 (patch)
tree76813f8d5c559169fb6e874e2d035752dc74a5fb
parentbce94e7bab964f967dc70ae5e5190ada5c5d83a1 (diff)
downloadchromium_src-1482a09d841f71aed1cdf0130bfd5180d8a835c0.zip
chromium_src-1482a09d841f71aed1cdf0130bfd5180d8a835c0.tar.gz
chromium_src-1482a09d841f71aed1cdf0130bfd5180d8a835c0.tar.bz2
Spin throbber even at the start of a cross-site navigation.
R=creis@chromium.org Review URL: http://codereview.chromium.org/7277071 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91429 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/browser/renderer_host/render_view_host.cc28
1 files changed, 14 insertions, 14 deletions
diff --git a/content/browser/renderer_host/render_view_host.cc b/content/browser/renderer_host/render_view_host.cc
index 2701853..0e5f66b 100644
--- a/content/browser/renderer_host/render_view_host.cc
+++ b/content/browser/renderer_host/render_view_host.cc
@@ -217,22 +217,22 @@ void RenderViewHost::Navigate(const ViewMsg_Navigate_Params& params) {
is_waiting_for_unload_ack_ = false;
Send(nav_message);
-
- // Force the throbber to start. We do this because WebKit's "started
- // loading" message will be received asynchronously from the UI of the
- // browser. But we want to keep the throbber in sync with what's happening
- // in the UI. For example, we want to start throbbing immediately when the
- // user naivgates even if the renderer is delayed. There is also an issue
- // with the throbber starting because the WebUI (which controls whether the
- // favicon is displayed) happens synchronously. If the start loading
- // messages was asynchronous, then the default favicon would flash in.
- //
- // WebKit doesn't send throb notifications for JavaScript URLs, so we
- // don't want to either.
- if (!params.url.SchemeIs(chrome::kJavaScriptScheme))
- delegate_->DidStartLoading();
}
+ // Force the throbber to start. We do this because WebKit's "started
+ // loading" message will be received asynchronously from the UI of the
+ // browser. But we want to keep the throbber in sync with what's happening
+ // in the UI. For example, we want to start throbbing immediately when the
+ // user naivgates even if the renderer is delayed. There is also an issue
+ // with the throbber starting because the WebUI (which controls whether the
+ // favicon is displayed) happens synchronously. If the start loading
+ // messages was asynchronous, then the default favicon would flash in.
+ //
+ // WebKit doesn't send throb notifications for JavaScript URLs, so we
+ // don't want to either.
+ if (!params.url.SchemeIs(chrome::kJavaScriptScheme))
+ delegate_->DidStartLoading();
+
FOR_EACH_OBSERVER(
RenderViewHostObserver, observers_, Navigate(params));
}