| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 "content/browser/renderer_host/render_widget_host_view_aura.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 360 ancestors_.clear(); | 360 ancestors_.clear(); |
| 361 } | 361 } |
| 362 | 362 |
| 363 RenderWidgetHostViewAura* view_; | 363 RenderWidgetHostViewAura* view_; |
| 364 std::set<aura::Window*> ancestors_; | 364 std::set<aura::Window*> ancestors_; |
| 365 | 365 |
| 366 DISALLOW_COPY_AND_ASSIGN(WindowAncestorObserver); | 366 DISALLOW_COPY_AND_ASSIGN(WindowAncestorObserver); |
| 367 }; | 367 }; |
| 368 | 368 |
| 369 bool IsMus() { | 369 bool IsMus() { |
| 370 return aura::Env::GetInstance()->mode() == aura::Env::Mode::MUS && | 370 return aura::Env::GetInstance()->mode() == aura::Env::Mode::MUS; |
| 371 !base::CommandLine::ForCurrentProcess()->HasSwitch( | |
| 372 switches::kNoUseMusInRenderer); | |
| 373 } | 371 } |
| 374 | 372 |
| 375 //////////////////////////////////////////////////////////////////////////////// | 373 //////////////////////////////////////////////////////////////////////////////// |
| 376 // RenderWidgetHostViewAura, public: | 374 // RenderWidgetHostViewAura, public: |
| 377 | 375 |
| 378 RenderWidgetHostViewAura::RenderWidgetHostViewAura(RenderWidgetHost* host, | 376 RenderWidgetHostViewAura::RenderWidgetHostViewAura(RenderWidgetHost* host, |
| 379 bool is_guest_view_hack) | 377 bool is_guest_view_hack) |
| 380 : host_(RenderWidgetHostImpl::From(host)), | 378 : host_(RenderWidgetHostImpl::From(host)), |
| 381 window_(nullptr), | 379 window_(nullptr), |
| 382 in_shutdown_(false), | 380 in_shutdown_(false), |
| (...skipping 1996 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2379 | 2377 |
| 2380 void RenderWidgetHostViewAura::SetPopupChild( | 2378 void RenderWidgetHostViewAura::SetPopupChild( |
| 2381 RenderWidgetHostViewAura* popup_child_host_view) { | 2379 RenderWidgetHostViewAura* popup_child_host_view) { |
| 2382 popup_child_host_view_ = popup_child_host_view; | 2380 popup_child_host_view_ = popup_child_host_view; |
| 2383 event_handler_->SetPopupChild( | 2381 event_handler_->SetPopupChild( |
| 2384 popup_child_host_view, | 2382 popup_child_host_view, |
| 2385 popup_child_host_view ? popup_child_host_view->event_handler() : nullptr); | 2383 popup_child_host_view ? popup_child_host_view->event_handler() : nullptr); |
| 2386 } | 2384 } |
| 2387 | 2385 |
| 2388 } // namespace content | 2386 } // namespace content |
| OLD | NEW |