| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "ash/wm/immersive_fullscreen_controller.h" | 5 #include "ash/wm/immersive_fullscreen_controller.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 | 8 |
| 9 #include "ash/ash_constants.h" | 9 #include "ash/ash_constants.h" |
| 10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| (...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 170 // aura::WindowObserver overrides: | 170 // aura::WindowObserver overrides: |
| 171 void OnWindowVisibilityChanged(aura::Window* window, bool visible) override; | 171 void OnWindowVisibilityChanged(aura::Window* window, bool visible) override; |
| 172 void OnWindowDestroying(aura::Window* window) override; | 172 void OnWindowDestroying(aura::Window* window) override; |
| 173 | 173 |
| 174 ImmersiveFullscreenController* controller_; | 174 ImmersiveFullscreenController* controller_; |
| 175 | 175 |
| 176 std::set<aura::Window*> bubbles_; | 176 std::set<aura::Window*> bubbles_; |
| 177 | 177 |
| 178 // Lock which keeps the top-of-window views revealed based on whether any of | 178 // Lock which keeps the top-of-window views revealed based on whether any of |
| 179 // |bubbles_| is visible. | 179 // |bubbles_| is visible. |
| 180 scoped_ptr<ImmersiveRevealedLock> revealed_lock_; | 180 std::unique_ptr<ImmersiveRevealedLock> revealed_lock_; |
| 181 | 181 |
| 182 DISALLOW_COPY_AND_ASSIGN(BubbleObserver); | 182 DISALLOW_COPY_AND_ASSIGN(BubbleObserver); |
| 183 }; | 183 }; |
| 184 | 184 |
| 185 ImmersiveFullscreenController::BubbleObserver::BubbleObserver( | 185 ImmersiveFullscreenController::BubbleObserver::BubbleObserver( |
| 186 ImmersiveFullscreenController* controller) | 186 ImmersiveFullscreenController* controller) |
| 187 : controller_(controller) {} | 187 : controller_(controller) {} |
| 188 | 188 |
| 189 ImmersiveFullscreenController::BubbleObserver::~BubbleObserver() { | 189 ImmersiveFullscreenController::BubbleObserver::~BubbleObserver() { |
| 190 for (std::set<aura::Window*>::const_iterator it = bubbles_.begin(); | 190 for (std::set<aura::Window*>::const_iterator it = bubbles_.begin(); |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 282 EnableWindowObservers(false); | 282 EnableWindowObservers(false); |
| 283 } | 283 } |
| 284 | 284 |
| 285 void ImmersiveFullscreenController::Init(Delegate* delegate, | 285 void ImmersiveFullscreenController::Init(Delegate* delegate, |
| 286 views::Widget* widget, | 286 views::Widget* widget, |
| 287 views::View* top_container) { | 287 views::View* top_container) { |
| 288 delegate_ = delegate; | 288 delegate_ = delegate; |
| 289 top_container_ = top_container; | 289 top_container_ = top_container; |
| 290 widget_ = widget; | 290 widget_ = widget; |
| 291 native_window_ = widget_->GetNativeWindow(); | 291 native_window_ = widget_->GetNativeWindow(); |
| 292 native_window_->SetEventTargeter(scoped_ptr<ui::EventTargeter>( | 292 native_window_->SetEventTargeter(std::unique_ptr<ui::EventTargeter>( |
| 293 new ResizeHandleWindowTargeter(native_window_, this))); | 293 new ResizeHandleWindowTargeter(native_window_, this))); |
| 294 } | 294 } |
| 295 | 295 |
| 296 void ImmersiveFullscreenController::SetEnabled(WindowType window_type, | 296 void ImmersiveFullscreenController::SetEnabled(WindowType window_type, |
| 297 bool enabled) { | 297 bool enabled) { |
| 298 if (enabled_ == enabled) | 298 if (enabled_ == enabled) |
| 299 return; | 299 return; |
| 300 enabled_ = enabled; | 300 enabled_ = enabled; |
| 301 | 301 |
| 302 EnableWindowObservers(enabled_); | 302 EnableWindowObservers(enabled_); |
| (...skipping 660 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 963 ::wm::GetTransientChildren(native_window_); | 963 ::wm::GetTransientChildren(native_window_); |
| 964 for (size_t i = 0; i < transient_children.size(); ++i) { | 964 for (size_t i = 0; i < transient_children.size(); ++i) { |
| 965 aura::Window* transient_child = transient_children[i]; | 965 aura::Window* transient_child = transient_children[i]; |
| 966 views::View* anchor_view = GetAnchorView(transient_child); | 966 views::View* anchor_view = GetAnchorView(transient_child); |
| 967 if (anchor_view && top_container_->Contains(anchor_view)) | 967 if (anchor_view && top_container_->Contains(anchor_view)) |
| 968 bubble_observer_->StartObserving(transient_child); | 968 bubble_observer_->StartObserving(transient_child); |
| 969 } | 969 } |
| 970 } | 970 } |
| 971 | 971 |
| 972 } // namespace ash | 972 } // namespace ash |
| OLD | NEW |