Revert "MacViews: Get chrome/browser/ui/views/frame to compile"

chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/top_container_view.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/aura/window.h"
 #include "ui/views/view.h"
@@ skipping 15 matching lines @@
   switch (animate_reveal) {
     case ImmersiveModeController::ANIMATE_REVEAL_YES:
       return ash::ImmersiveFullscreenController::ANIMATE_REVEAL_YES;
     case ImmersiveModeController::ANIMATE_REVEAL_NO:
       return ash::ImmersiveFullscreenController::ANIMATE_REVEAL_NO;
   }
   NOTREACHED();
   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()
     : controller_(new ash::ImmersiveFullscreenController),
       browser_view_(NULL),
       native_window_(NULL),
       observers_enabled_(false),
       use_tab_indicators_(false),
       visible_fraction_(1) {
 }
@@ skipping 48 matching lines @@
   // |browser_view_|.
   if (!IsRevealed())
     return 0;
 
   int height = top_container_size.height() - kAnimationOffsetY;
   return static_cast<int>(height * (visible_fraction_ - 1));
 }
 
 ImmersiveRevealedLock* ImmersiveModeControllerAsh::GetRevealedLock(
     AnimateReveal animate_reveal) {
-  return new ImmersiveRevealedLockAsh(controller_->GetRevealedLock(
-      ToImmersiveFullscreenControllerAnimateReveal(animate_reveal)));
+  return controller_->GetRevealedLock(
+      ToImmersiveFullscreenControllerAnimateReveal(animate_reveal));
 }
 
 void ImmersiveModeControllerAsh::OnFindBarVisibleBoundsChanged(
     const gfx::Rect& new_visible_bounds_in_screen) {
   find_bar_visible_bounds_in_screen_ = new_visible_bounds_in_screen;
 }
 
 void ImmersiveModeControllerAsh::SetupForTest() {
   controller_->SetupForTest();
 }
@@ skipping 118 matching lines @@
   // prevent it from being revealed.
   bool in_tab_fullscreen = content::Source<FullscreenController>(source)->
       IsWindowFullscreenForTabOrPending();
   ash::wm::GetWindowState(native_window_)->set_hide_shelf_when_fullscreen(
       in_tab_fullscreen);
   ash::Shell::GetInstance()->UpdateShelfVisibility();
 
   if (tab_indicator_visibility_changed)
     LayoutBrowserRootView();
 }