summaryrefslogtreecommitdiffstats
path: root/ash/test
diff options
context:
space:
mode:
authorderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-03 01:15:10 +0000
committerderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-03 01:15:10 +0000
commit697f04c0a9168dfb3b85f8764ad9e4fb32e369e3 (patch)
tree2a06773998e72c5ea2d06869aab03567f9463bf5 /ash/test
parentabd82e6cf2b284bc839acf9984d90111787a9065 (diff)
downloadchromium_src-697f04c0a9168dfb3b85f8764ad9e4fb32e369e3.zip
chromium_src-697f04c0a9168dfb3b85f8764ad9e4fb32e369e3.tar.gz
chromium_src-697f04c0a9168dfb3b85f8764ad9e4fb32e369e3.tar.bz2
ash: Display system background while loading wallpaper.
When the wallpaper takes a long time to load, areas of the screen that aren't covered by other layers are painted white. This looks okay when we first boot, but not when we're displaying the login after logging out or while we're starting a guest session. This makes us instead initialize SystemBackgroundController immediately with either a #fefefe or black color depending on whether this is the first Chrome run after boot or not. Its color is updated to black after the login wallpaper animation is finished. BUG=151111,152751 Review URL: https://chromiumcodereview.appspot.com/11054005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159822 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test')
-rw-r--r--ash/test/test_shell_delegate.cc4
-rw-r--r--ash/test/test_shell_delegate.h1
2 files changed, 5 insertions, 0 deletions
diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc
index e690c16..0526b85 100644
--- a/ash/test/test_shell_delegate.cc
+++ b/ash/test/test_shell_delegate.cc
@@ -32,6 +32,10 @@ bool TestShellDelegate::IsSessionStarted() {
return true;
}
+bool TestShellDelegate::IsFirstRunAfterBoot() {
+ return false;
+}
+
void TestShellDelegate::LockScreen() {
locked_ = true;
}
diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h
index bd41219..f815d18 100644
--- a/ash/test/test_shell_delegate.h
+++ b/ash/test/test_shell_delegate.h
@@ -20,6 +20,7 @@ class TestShellDelegate : public ShellDelegate {
// Overridden from ShellDelegate:
virtual bool IsUserLoggedIn() OVERRIDE;
virtual bool IsSessionStarted() OVERRIDE;
+ virtual bool IsFirstRunAfterBoot() OVERRIDE;
virtual void LockScreen() OVERRIDE;
virtual void UnlockScreen() OVERRIDE;
virtual bool IsScreenLocked() const OVERRIDE;