| Index: chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc
|
| diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc b/chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc
|
| index d7f12d2ab7e6702417bd13ec0e29bedda2709320..17928ea04ea5406aa25f4191bfc2886090e4b897 100644
|
| --- a/chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc
|
| +++ b/chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc
|
| @@ -5,6 +5,7 @@
|
| #include "chrome/browser/ui/views/frame/immersive_mode_controller_ash.h"
|
|
|
| #include "ash/shell.h"
|
| +#include "ash/wm/immersive_revealed_lock.h"
|
| #include "ash/wm/window_state.h"
|
| #include "chrome/browser/chrome_notification_types.h"
|
| #include "chrome/browser/ui/fullscreen/fullscreen_controller.h"
|
| @@ -40,6 +41,17 @@ ToImmersiveFullscreenControllerAnimateReveal(
|
| return ash::ImmersiveFullscreenController::ANIMATE_REVEAL_NO;
|
| }
|
|
|
| +class ImmersiveRevealedLockAsh : public ImmersiveRevealedLock {
|
| + public:
|
| + explicit ImmersiveRevealedLockAsh(ash::ImmersiveRevealedLock* lock)
|
| + : lock_(lock) {}
|
| +
|
| + private:
|
| + scoped_ptr<ash::ImmersiveRevealedLock> lock_;
|
| +
|
| + DISALLOW_COPY_AND_ASSIGN(ImmersiveRevealedLockAsh);
|
| +};
|
| +
|
| } // namespace
|
|
|
| ImmersiveModeControllerAsh::ImmersiveModeControllerAsh()
|
| @@ -108,8 +120,8 @@ int ImmersiveModeControllerAsh::GetTopContainerVerticalOffset(
|
|
|
| ImmersiveRevealedLock* ImmersiveModeControllerAsh::GetRevealedLock(
|
| AnimateReveal animate_reveal) {
|
| - return controller_->GetRevealedLock(
|
| - ToImmersiveFullscreenControllerAnimateReveal(animate_reveal));
|
| + return new ImmersiveRevealedLockAsh(controller_->GetRevealedLock(
|
| + ToImmersiveFullscreenControllerAnimateReveal(animate_reveal)));
|
| }
|
|
|
| void ImmersiveModeControllerAsh::OnFindBarVisibleBoundsChanged(
|
|
|