diff options
| author | arv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-14 17:46:51 +0000 |
|---|---|---|
| committer | arv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-14 17:46:51 +0000 |
| commit | fac9a45d0e29394b6445a4a1a8ec20dc9e917a3d (patch) | |
| tree | 151e26c1195a0b04aa7e117584db6d0bce5255ee /chrome/browser | |
| parent | b7bb4a00aeefd19ee95a9e23ff4c9cc1a22e9785 (diff) | |
| download | chromium_src-fac9a45d0e29394b6445a4a1a8ec20dc9e917a3d.zip chromium_src-fac9a45d0e29394b6445a4a1a8ec20dc9e917a3d.tar.gz chromium_src-fac9a45d0e29394b6445a4a1a8ec20dc9e917a3d.tar.bz2 | |
Make sure we don't "hang" when the bookmarks extension API does not work. Also, make sure we don't "hang" when the chrome url override failed.
BUG=43448
TEST=Manually
Review URL: http://codereview.chromium.org/2108001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47283 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/dom_ui/bookmarks_ui.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/chrome_url_data_manager.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/resources/bookmark_manager/main.html | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/chrome/browser/dom_ui/bookmarks_ui.cc b/chrome/browser/dom_ui/bookmarks_ui.cc index 869ccc2..81a8a52 100644 --- a/chrome/browser/dom_ui/bookmarks_ui.cc +++ b/chrome/browser/dom_ui/bookmarks_ui.cc @@ -31,11 +31,13 @@ void BookmarksUIHTMLSource::StartDataRequest(const std::string& path, int request_id) { NOTREACHED() << "We should never get here since the extension should have" << "been triggered"; + + SendResponse(request_id, NULL); } std::string BookmarksUIHTMLSource::GetMimeType(const std::string& path) const { - NOTREACHED() << "We should never get here since the extension should have" - << "been triggered"; + NOTREACHED() << "We should never get here since the extension should have" + << "been triggered"; return "text/html"; } diff --git a/chrome/browser/dom_ui/chrome_url_data_manager.cc b/chrome/browser/dom_ui/chrome_url_data_manager.cc index e21e849..e0175e8 100644 --- a/chrome/browser/dom_ui/chrome_url_data_manager.cc +++ b/chrome/browser/dom_ui/chrome_url_data_manager.cc @@ -379,7 +379,7 @@ void URLRequestChromeJob::DataAvailable(RefCountedMemory* bytes) { } } else { // The request failed. - NotifyDone(URLRequestStatus(URLRequestStatus::FAILED, 0)); + NotifyDone(URLRequestStatus(URLRequestStatus::FAILED, net::ERR_FAILED)); } } diff --git a/chrome/browser/resources/bookmark_manager/main.html b/chrome/browser/resources/bookmark_manager/main.html index 04d4cc2..7e9cc80 100644 --- a/chrome/browser/resources/bookmark_manager/main.html +++ b/chrome/browser/resources/bookmark_manager/main.html @@ -48,7 +48,7 @@ found in the LICENSE file. // Sometimes the extension API is not initialized. if (!chrome.bookmarks) - window.location.reload(); + console.error('Bookmarks extension API is not avaiable'); // Allow platform specific CSS rules. if (cr.isMac) |