summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-10 15:04:47 +0000
committermirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-10 15:04:47 +0000
commitf7e0ab793040070958e2bc7c8556eabe977027c6 (patch)
tree6daada073ad87ab2f069d260bc949105750540ea
parenta5f50951829755c4f230aa32b5438f6d42eb0a0b (diff)
downloadchromium_src-f7e0ab793040070958e2bc7c8556eabe977027c6.zip
chromium_src-f7e0ab793040070958e2bc7c8556eabe977027c6.tar.gz
chromium_src-f7e0ab793040070958e2bc7c8556eabe977027c6.tar.bz2
Force NTP reload when a new theme is installed.
BUG=74311 TEST=NTP background updates immediately on theme install. Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=77517 Review URL: http://codereview.chromium.org/6653001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77639 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/sessions/session_restore_uitest.cc7
-rw-r--r--chrome/browser/ui/webui/theme_source.cc4
2 files changed, 9 insertions, 2 deletions
diff --git a/chrome/browser/sessions/session_restore_uitest.cc b/chrome/browser/sessions/session_restore_uitest.cc
index 917e095..c598905 100644
--- a/chrome/browser/sessions/session_restore_uitest.cc
+++ b/chrome/browser/sessions/session_restore_uitest.cc
@@ -450,7 +450,12 @@ TEST_F(SessionRestoreUITest, TwoWindowsCloseOneRestoreOnlyOne) {
// process-per-site and process-per-site-instance, because we treat the new tab
// as a special case in process-per-site-instance so that it only ever uses one
// process.)
-TEST_F(SessionRestoreUITest, ShareProcessesOnRestore) {
+//
+// Flaky: http://http://code.google.com/p/chromium/issues/detail?id=52022
+// Unfortunately, the fix at http://http://codereview.chromium.org/6546078
+// breaks NTP background image refreshing, so ThemeSource had to revert to
+// replacing the existing data source.
+TEST_F(SessionRestoreUITest, FLAKY_ShareProcessesOnRestore) {
if (ProxyLauncher::in_process_renderer()) {
// No point in running this test in single process mode.
return;
diff --git a/chrome/browser/ui/webui/theme_source.cc b/chrome/browser/ui/webui/theme_source.cc
index 1572017..9c87ce9 100644
--- a/chrome/browser/ui/webui/theme_source.cc
+++ b/chrome/browser/ui/webui/theme_source.cc
@@ -95,7 +95,9 @@ MessageLoop* ThemeSource::MessageLoopForRequestPath(
}
bool ThemeSource::ShouldReplaceExistingSource() const {
- return false;
+ // We currently get the css_bytes_ in the ThemeSource constructor, so we need
+ // to recreate the source itself when a theme changes.
+ return true;
}
////////////////////////////////////////////////////////////////////////////////