summaryrefslogtreecommitdiffstats
path: root/chrome/browser/resources
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-06 10:37:49 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-06 10:37:49 +0000
commit058749bb1d39016bd1050879f97a356dc3a2f78c (patch)
treecda641b362dd19cbd0d70ccf63f57046b501cbff /chrome/browser/resources
parentf9268a9615feeed557e0a143f86dc35bed6af3c3 (diff)
downloadchromium_src-058749bb1d39016bd1050879f97a356dc3a2f78c.zip
chromium_src-058749bb1d39016bd1050879f97a356dc3a2f78c.tar.gz
chromium_src-058749bb1d39016bd1050879f97a356dc3a2f78c.tar.bz2
Don't reload the history page if something got deleted.
Only reload it if the user requested the deletion through the history page itself. BUG=49475 TEST=none Review URL: http://codereview.chromium.org/6691055 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80600 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources')
-rw-r--r--chrome/browser/resources/history.html10
-rw-r--r--chrome/browser/resources/history2.html10
2 files changed, 2 insertions, 18 deletions
diff --git a/chrome/browser/resources/history.html b/chrome/browser/resources/history.html
index 926560b..bc65141 100644
--- a/chrome/browser/resources/history.html
+++ b/chrome/browser/resources/history.html
@@ -1027,6 +1027,7 @@ function deleteComplete() {
deleteNextInQueue();
} else {
deleteQueue = [];
+ historyView.reload();
}
}
@@ -1040,15 +1041,6 @@ function deleteFailed() {
deleteInFlight = false;
setTimeout(deleteNextInQueue, 500);
}
-
-/**
- * We're called when something is deleted (either by us or by someone
- * else).
- */
-function historyDeleted() {
- window.console.log('History deleted');
- historyView.reload();
-}
</script>
<link rel="stylesheet" href="webui.css">
<style>
diff --git a/chrome/browser/resources/history2.html b/chrome/browser/resources/history2.html
index ddff0a6..722a6ac 100644
--- a/chrome/browser/resources/history2.html
+++ b/chrome/browser/resources/history2.html
@@ -1059,6 +1059,7 @@ function deleteComplete() {
deleteNextInQueue();
} else {
deleteQueue = [];
+ historyView.reload();
}
}
@@ -1072,15 +1073,6 @@ function deleteFailed() {
deleteInFlight = false;
setTimeout(deleteNextInQueue, 500);
}
-
-/**
- * We're called when something is deleted (either by us or by someone
- * else).
- */
-function historyDeleted() {
- window.console.log('History deleted');
- historyView.reload();
-}
</script>
<link rel="stylesheet" href="webui2.css">
<style>