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/wm/system_modal_container_layout_manager_unittest.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/wm/system_modal_container_layout_manager_unittest.cc')
| -rw-r--r-- | ash/wm/system_modal_container_layout_manager_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ash/wm/system_modal_container_layout_manager_unittest.cc b/ash/wm/system_modal_container_layout_manager_unittest.cc index f7d7373..15107a4 100644 --- a/ash/wm/system_modal_container_layout_manager_unittest.cc +++ b/ash/wm/system_modal_container_layout_manager_unittest.cc @@ -5,8 +5,8 @@ #include "ash/wm/system_modal_container_layout_manager.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/test/ash_test_base.h" #include "ash/wm/window_util.h" @@ -313,7 +313,7 @@ TEST_F(SystemModalContainerLayoutManagerTest, EventFocusContainers) { // Create a window in the lock screen container and ensure that it receives // the mouse event instead of the modal window (crbug.com/110920). - Shell::GetInstance()->delegate()->LockScreen(); + Shell::GetInstance()->session_state_delegate()->LockScreen(); EventTestWindow* lock_delegate = new EventTestWindow(false); scoped_ptr<aura::Window> lock(lock_delegate->OpenTestWindowWithParent( Shell::GetPrimaryRootWindowController()->GetContainer( @@ -337,7 +337,7 @@ TEST_F(SystemModalContainerLayoutManagerTest, EventFocusContainers) { EXPECT_EQ(1, lock_delegate->mouse_presses()); EXPECT_EQ(1, lock_modal_delegate->mouse_presses()); - Shell::GetInstance()->delegate()->UnlockScreen(); + Shell::GetInstance()->session_state_delegate()->UnlockScreen(); } // Makes sure we don't crash if a modal window is shown while the parent window @@ -409,7 +409,7 @@ TEST_F(SystemModalContainerLayoutManagerTest, ShowNormalBackgroundOrLocked) { // Normal system modal window while locked. Shows locked system modal // background. - Shell::GetInstance()->delegate()->LockScreen(); + Shell::GetInstance()->session_state_delegate()->LockScreen(); scoped_ptr<aura::Window> lock_parent(OpenTestWindowWithParent( Shell::GetPrimaryRootWindowController()->GetContainer( ash::internal::kShellWindowId_LockScreenContainer), |