diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-25 01:06:05 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-25 01:06:05 +0000 |
| commit | f86a07024080cd1b000105bce34ce45b2bd5159b (patch) | |
| tree | d47e27fae62581ffb7f4e4209c7dd0106b88763f /chrome/browser/web_contents.cc | |
| parent | 2d42a37132679537eb9e8db9f45a6dfe92dde996 (diff) | |
| download | chromium_src-f86a07024080cd1b000105bce34ce45b2bd5159b.zip chromium_src-f86a07024080cd1b000105bce34ce45b2bd5159b.tar.gz chromium_src-f86a07024080cd1b000105bce34ce45b2bd5159b.tar.bz2 | |
Re-land 5929 (r5882) with crash fix and also this change:
http://codereview.chromium.org/11392/show
which fixes the remainder of the UI test issues apparently.
http://crbug.com/4620
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5954 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/web_contents.cc')
| -rw-r--r-- | chrome/browser/web_contents.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/web_contents.cc b/chrome/browser/web_contents.cc index 60ba95b4..c3c0a9e 100644 --- a/chrome/browser/web_contents.cc +++ b/chrome/browser/web_contents.cc @@ -855,8 +855,6 @@ void WebContents::RequestMove(const gfx::Rect& new_bounds) { } void WebContents::DidStartLoading(RenderViewHost* rvh, int32 page_id) { - if (plugin_installer_ != NULL) - plugin_installer_->OnStartLoading(); SetIsLoading(true, NULL); } @@ -1339,12 +1337,13 @@ void WebContents::OnCrashedPlugin(const std::wstring& plugin_path) { plugin_name = product_name; } AddInfoBar(new SimpleAlertInfoBarDelegate( - l10n_util::GetStringF(IDS_PLUGIN_CRASHED_PROMPT, plugin_name), NULL)); + this, l10n_util::GetStringF(IDS_PLUGIN_CRASHED_PROMPT, plugin_name), + NULL)); } void WebContents::OnJSOutOfMemory() { AddInfoBar(new SimpleAlertInfoBarDelegate( - l10n_util::GetString(IDS_JS_OUT_OF_MEMORY_PROMPT), NULL)); + this, l10n_util::GetString(IDS_JS_OUT_OF_MEMORY_PROMPT), NULL)); } bool WebContents::CanBlur() const { |