diff options
| author | bartfab@google.com <bartfab@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-17 15:58:49 +0000 |
|---|---|---|
| committer | bartfab@google.com <bartfab@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-17 15:58:49 +0000 |
| commit | fcb123d44af34a938e26b9821849af60c69a39be (patch) | |
| tree | aab13850b4a5baaa884a95697ca860aef6feab67 /ash/desktop_background/desktop_background_view.cc | |
| parent | 6f9c92afe8310daca92f34b609ebaa37c3c7e2da (diff) | |
| download | chromium_src-fcb123d44af34a938e26b9821849af60c69a39be.zip chromium_src-fcb123d44af34a938e26b9821849af60c69a39be.tar.gz chromium_src-fcb123d44af34a938e26b9821849af60c69a39be.tar.bz2 | |
Revert 194589 "Revert 194578 "Add ash SessionStateDelegate""
The CL turned out to be innocent, the bots turned green without the revert.
> Revert 194578 "Add ash SessionStateDelegate"
>
> > Add ash SessionStateDelegate
> >
> > This CL refactors the ShellDelegate by adding a SessionStateDelegate to
> > which methods dealing with the session state can be moved. This cleans up
> > the huge ShellDelegate interface and paves the way for further Chrome OS
> > multiprofile work which will need to add several new methods related to
> > the session state.
> >
> > This CL is only the first step. Several other methods should also move to
> > SessionStateDelegate but I do not want to overburden a single CL.
> >
> > BUG=None
> > TEST=Manual and browser/unit tests
> >
> > TBR=sky (for c/b/idle_chromeos.cc and c/chrome_browser_ui.gypi)
> >
> > Review URL: https://codereview.chromium.org/14295008
>
> TBR=bartfab@google.com
>
> Review URL: https://codereview.chromium.org/14200034
TBR=gavinp@chromium.org
Review URL: https://codereview.chromium.org/14200038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194602 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/desktop_background/desktop_background_view.cc')
| -rw-r--r-- | ash/desktop_background/desktop_background_view.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ash/desktop_background/desktop_background_view.cc b/ash/desktop_background/desktop_background_view.cc index 35e7d0d..6d6e487 100644 --- a/ash/desktop_background/desktop_background_view.cc +++ b/ash/desktop_background/desktop_background_view.cc @@ -11,8 +11,8 @@ #include "ash/desktop_background/desktop_background_widget_controller.h" #include "ash/desktop_background/user_wallpaper_delegate.h" #include "ash/root_window_controller.h" +#include "ash/session_state_delegate.h" #include "ash/shell.h" -#include "ash/shell_delegate.h" #include "ash/shell_window_ids.h" #include "ash/wm/property_util.h" #include "ash/wm/window_animations.h" @@ -201,8 +201,7 @@ views::Widget* CreateDesktopBackground(aura::RootWindow* root_window, // 4. From an empty background, guest user logged in. if (wallpaper_delegate->ShouldShowInitialAnimation() || root_window->GetProperty(kAnimatingDesktopController) || - Shell::GetInstance()->delegate()->IsGuestSession() || - Shell::GetInstance()->delegate()->IsUserLoggedIn()) { + Shell::GetInstance()->session_state_delegate()->HasActiveUser()) { views::corewm::SetWindowVisibilityAnimationTransition( desktop_widget->GetNativeView(), views::corewm::ANIMATE_SHOW); } else { |