OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/views/frame/immersive_mode_controller_ash.h" | 5 #include "chrome/browser/ui/views/frame/immersive_mode_controller_ash.h" |
6 | 6 |
7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
8 #include "ash/wm/immersive_revealed_lock.h" | 8 #include "ash/wm/immersive_revealed_lock.h" |
9 #include "ash/wm/window_state.h" | 9 #include "ash/wm/window_state.h" |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 NOTREACHED(); | 42 NOTREACHED(); |
43 return ash::ImmersiveFullscreenController::ANIMATE_REVEAL_NO; | 43 return ash::ImmersiveFullscreenController::ANIMATE_REVEAL_NO; |
44 } | 44 } |
45 | 45 |
46 class ImmersiveRevealedLockAsh : public ImmersiveRevealedLock { | 46 class ImmersiveRevealedLockAsh : public ImmersiveRevealedLock { |
47 public: | 47 public: |
48 explicit ImmersiveRevealedLockAsh(ash::ImmersiveRevealedLock* lock) | 48 explicit ImmersiveRevealedLockAsh(ash::ImmersiveRevealedLock* lock) |
49 : lock_(lock) {} | 49 : lock_(lock) {} |
50 | 50 |
51 private: | 51 private: |
52 scoped_ptr<ash::ImmersiveRevealedLock> lock_; | 52 std::unique_ptr<ash::ImmersiveRevealedLock> lock_; |
53 | 53 |
54 DISALLOW_COPY_AND_ASSIGN(ImmersiveRevealedLockAsh); | 54 DISALLOW_COPY_AND_ASSIGN(ImmersiveRevealedLockAsh); |
55 }; | 55 }; |
56 | 56 |
57 } // namespace | 57 } // namespace |
58 | 58 |
59 ImmersiveModeControllerAsh::ImmersiveModeControllerAsh() | 59 ImmersiveModeControllerAsh::ImmersiveModeControllerAsh() |
60 : controller_(new ash::ImmersiveFullscreenController), | 60 : controller_(new ash::ImmersiveFullscreenController), |
61 browser_view_(nullptr), | 61 browser_view_(nullptr), |
62 native_window_(nullptr), | 62 native_window_(nullptr), |
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
258 // prevent it from being revealed. | 258 // prevent it from being revealed. |
259 bool in_tab_fullscreen = content::Source<FullscreenController>(source)-> | 259 bool in_tab_fullscreen = content::Source<FullscreenController>(source)-> |
260 IsWindowFullscreenForTabOrPending(); | 260 IsWindowFullscreenForTabOrPending(); |
261 ash::wm::GetWindowState(native_window_)->set_hide_shelf_when_fullscreen( | 261 ash::wm::GetWindowState(native_window_)->set_hide_shelf_when_fullscreen( |
262 in_tab_fullscreen); | 262 in_tab_fullscreen); |
263 ash::Shell::GetInstance()->UpdateShelfVisibility(); | 263 ash::Shell::GetInstance()->UpdateShelfVisibility(); |
264 | 264 |
265 if (tab_indicator_visibility_changed) | 265 if (tab_indicator_visibility_changed) |
266 LayoutBrowserRootView(); | 266 LayoutBrowserRootView(); |
267 } | 267 } |
OLD | NEW |