| Index: ash/wm/aura/wm_root_window_controller_aura.cc
|
| diff --git a/ash/wm/aura/wm_root_window_controller_aura.cc b/ash/wm/aura/wm_root_window_controller_aura.cc
|
| deleted file mode 100644
|
| index a5e3543e03747794e0ba5c082cbe7f76f40ee394..0000000000000000000000000000000000000000
|
| --- a/ash/wm/aura/wm_root_window_controller_aura.cc
|
| +++ /dev/null
|
| @@ -1,148 +0,0 @@
|
| -// Copyright 2016 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 "ash/wm/aura/wm_root_window_controller_aura.h"
|
| -
|
| -#include "ash/common/wm/wm_root_window_controller_observer.h"
|
| -#include "ash/display/window_tree_host_manager.h"
|
| -#include "ash/root_window_controller.h"
|
| -#include "ash/shelf/shelf.h"
|
| -#include "ash/shelf/shelf_widget.h"
|
| -#include "ash/shell.h"
|
| -#include "ash/wm/aura/wm_globals_aura.h"
|
| -#include "ash/wm/aura/wm_shelf_aura.h"
|
| -#include "ash/wm/aura/wm_window_aura.h"
|
| -#include "ash/wm/workspace_controller.h"
|
| -#include "ui/aura/window.h"
|
| -#include "ui/aura/window_property.h"
|
| -#include "ui/events/event_targeter.h"
|
| -#include "ui/events/event_utils.h"
|
| -
|
| -DECLARE_WINDOW_PROPERTY_TYPE(ash::wm::WmRootWindowControllerAura*);
|
| -
|
| -namespace ash {
|
| -namespace wm {
|
| -
|
| -// TODO(sky): it likely makes more sense to hang this off RootWindowSettings.
|
| -DEFINE_OWNED_WINDOW_PROPERTY_KEY(ash::wm::WmRootWindowControllerAura,
|
| - kWmRootWindowControllerKey,
|
| - nullptr);
|
| -
|
| -WmRootWindowControllerAura::WmRootWindowControllerAura(
|
| - RootWindowController* root_window_controller)
|
| - : root_window_controller_(root_window_controller) {
|
| - root_window_controller_->GetRootWindow()->SetProperty(
|
| - kWmRootWindowControllerKey, this);
|
| - Shell::GetInstance()->AddShellObserver(this);
|
| -}
|
| -
|
| -WmRootWindowControllerAura::~WmRootWindowControllerAura() {
|
| - Shell::GetInstance()->RemoveShellObserver(this);
|
| -}
|
| -
|
| -// static
|
| -const WmRootWindowControllerAura* WmRootWindowControllerAura::Get(
|
| - const aura::Window* window) {
|
| - if (!window)
|
| - return nullptr;
|
| -
|
| - RootWindowController* root_window_controller =
|
| - GetRootWindowController(window);
|
| - if (!root_window_controller)
|
| - return nullptr;
|
| -
|
| - WmRootWindowControllerAura* wm_root_window_controller =
|
| - root_window_controller->GetRootWindow()->GetProperty(
|
| - kWmRootWindowControllerKey);
|
| - if (wm_root_window_controller)
|
| - return wm_root_window_controller;
|
| -
|
| - // WmRootWindowControllerAura is owned by the RootWindowController's window.
|
| - return new WmRootWindowControllerAura(root_window_controller);
|
| -}
|
| -
|
| -bool WmRootWindowControllerAura::HasShelf() {
|
| - return root_window_controller_->shelf_widget() != nullptr;
|
| -}
|
| -
|
| -WmGlobals* WmRootWindowControllerAura::GetGlobals() {
|
| - return WmGlobals::Get();
|
| -}
|
| -
|
| -WorkspaceWindowState WmRootWindowControllerAura::GetWorkspaceWindowState() {
|
| - return root_window_controller_->workspace_controller()->GetWindowState();
|
| -}
|
| -
|
| -AlwaysOnTopController* WmRootWindowControllerAura::GetAlwaysOnTopController() {
|
| - return root_window_controller_->always_on_top_controller();
|
| -}
|
| -
|
| -WmShelf* WmRootWindowControllerAura::GetShelf() {
|
| - return root_window_controller_->shelf_widget()
|
| - ? root_window_controller_->shelf_widget()->shelf()->wm_shelf()
|
| - : nullptr;
|
| -}
|
| -
|
| -WmWindow* WmRootWindowControllerAura::GetWindow() {
|
| - return WmWindowAura::Get(root_window_controller_->GetRootWindow());
|
| -}
|
| -
|
| -void WmRootWindowControllerAura::ConfigureWidgetInitParamsForContainer(
|
| - views::Widget* widget,
|
| - int shell_container_id,
|
| - views::Widget::InitParams* init_params) {
|
| - init_params->parent = Shell::GetContainer(
|
| - root_window_controller_->GetRootWindow(), shell_container_id);
|
| -}
|
| -
|
| -WmWindow* WmRootWindowControllerAura::FindEventTarget(
|
| - const gfx::Point& location_in_screen) {
|
| - gfx::Point location_in_root =
|
| - GetWindow()->ConvertPointFromScreen(location_in_screen);
|
| - aura::Window* root = root_window_controller_->GetRootWindow();
|
| - ui::MouseEvent test_event(ui::ET_MOUSE_MOVED, location_in_root,
|
| - location_in_root, ui::EventTimeForNow(),
|
| - ui::EF_NONE, ui::EF_NONE);
|
| - ui::EventTarget* event_handler = static_cast<ui::EventTarget*>(root)
|
| - ->GetEventTargeter()
|
| - ->FindTargetForEvent(root, &test_event);
|
| - return WmWindowAura::Get(static_cast<aura::Window*>(event_handler));
|
| -}
|
| -
|
| -void WmRootWindowControllerAura::AddObserver(
|
| - WmRootWindowControllerObserver* observer) {
|
| - observers_.AddObserver(observer);
|
| -}
|
| -
|
| -void WmRootWindowControllerAura::RemoveObserver(
|
| - WmRootWindowControllerObserver* observer) {
|
| - observers_.RemoveObserver(observer);
|
| -}
|
| -
|
| -void WmRootWindowControllerAura::OnDisplayWorkAreaInsetsChanged() {
|
| - FOR_EACH_OBSERVER(WmRootWindowControllerObserver, observers_,
|
| - OnWorkAreaChanged());
|
| -}
|
| -
|
| -void WmRootWindowControllerAura::OnFullscreenStateChanged(
|
| - bool is_fullscreen,
|
| - aura::Window* root_window) {
|
| - if (root_window != root_window_controller_->GetRootWindow())
|
| - return;
|
| -
|
| - FOR_EACH_OBSERVER(WmRootWindowControllerObserver, observers_,
|
| - OnFullscreenStateChanged(is_fullscreen));
|
| -}
|
| -
|
| -void WmRootWindowControllerAura::OnShelfAlignmentChanged(
|
| - aura::Window* root_window) {
|
| - if (root_window != root_window_controller_->GetRootWindow())
|
| - return;
|
| -
|
| - FOR_EACH_OBSERVER(WmRootWindowControllerObserver, observers_,
|
| - OnShelfAlignmentChanged());
|
| -}
|
| -
|
| -} // namespace wm
|
| -} // namespace ash
|
|
|