diff options
| author | bartfab@google.com <bartfab@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-17 12:21:57 +0000 |
|---|---|---|
| committer | bartfab@google.com <bartfab@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-17 12:21:57 +0000 |
| commit | 5b5495c70de838b40cc9e5990140fd9b2ad16987 (patch) | |
| tree | b5b02aa5e8392edd79a275ffc613c0241e396414 /ash/desktop_background/desktop_background_view.cc | |
| parent | bac6ffd0f853d003e235a29d51f138ec4d70f034 (diff) | |
| download | chromium_src-5b5495c70de838b40cc9e5990140fd9b2ad16987.zip chromium_src-5b5495c70de838b40cc9e5990140fd9b2ad16987.tar.gz chromium_src-5b5495c70de838b40cc9e5990140fd9b2ad16987.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194578 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 { |