| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "ui/views/mus/native_widget_mus.h" | 5 #include "ui/views/mus/native_widget_mus.h" |
| 6 | 6 |
| 7 #include "components/mus/public/cpp/window.h" | 7 #include "components/mus/public/cpp/window.h" |
| 8 #include "components/mus/public/interfaces/window_manager.mojom.h" | 8 #include "components/mus/public/interfaces/window_manager.mojom.h" |
| 9 #include "mojo/converters/geometry/geometry_type_converters.h" | 9 #include "mojo/converters/geometry/geometry_type_converters.h" |
| 10 #include "ui/aura/client/default_capture_client.h" | 10 #include "ui/aura/client/default_capture_client.h" |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 if (!non_client_view || !non_client_view->client_view()) | 85 if (!non_client_view || !non_client_view->client_view()) |
| 86 return; | 86 return; |
| 87 | 87 |
| 88 window_->SetClientArea(non_client_view->client_view()->bounds()); | 88 window_->SetClientArea(non_client_view->client_view()->bounds()); |
| 89 } | 89 } |
| 90 | 90 |
| 91 //////////////////////////////////////////////////////////////////////////////// | 91 //////////////////////////////////////////////////////////////////////////////// |
| 92 // NativeWidgetMus, internal::NativeWidgetPrivate implementation: | 92 // NativeWidgetMus, internal::NativeWidgetPrivate implementation: |
| 93 | 93 |
| 94 void NativeWidgetMus::InitNativeWidget(const Widget::InitParams& params) { | 94 void NativeWidgetMus::InitNativeWidget(const Widget::InitParams& params) { |
| 95 window_tree_host_.reset(new WindowTreeHostMojo(shell_, window_)); | 95 window_tree_host_.reset(new WindowTreeHostMus(shell_, window_)); |
| 96 window_tree_host_->InitHost(); | 96 window_tree_host_->InitHost(); |
| 97 | 97 |
| 98 focus_client_.reset(new wm::FocusController(new FocusRulesImpl)); | 98 focus_client_.reset(new wm::FocusController(new FocusRulesImpl)); |
| 99 | 99 |
| 100 aura::client::SetFocusClient(window_tree_host_->window(), | 100 aura::client::SetFocusClient(window_tree_host_->window(), |
| 101 focus_client_.get()); | 101 focus_client_.get()); |
| 102 aura::client::SetActivationClient(window_tree_host_->window(), | 102 aura::client::SetActivationClient(window_tree_host_->window(), |
| 103 focus_client_.get()); | 103 focus_client_.get()); |
| 104 window_tree_host_->window()->AddPreTargetHandler(focus_client_.get()); | 104 window_tree_host_->window()->AddPreTargetHandler(focus_client_.get()); |
| 105 window_tree_host_->window()->SetLayoutManager( | 105 window_tree_host_->window()->SetLayoutManager( |
| (...skipping 462 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 568 } else { | 568 } else { |
| 569 native_widget_delegate_->OnScrollEvent(event); | 569 native_widget_delegate_->OnScrollEvent(event); |
| 570 } | 570 } |
| 571 } | 571 } |
| 572 | 572 |
| 573 void NativeWidgetMus::OnGestureEvent(ui::GestureEvent* event) { | 573 void NativeWidgetMus::OnGestureEvent(ui::GestureEvent* event) { |
| 574 native_widget_delegate_->OnGestureEvent(event); | 574 native_widget_delegate_->OnGestureEvent(event); |
| 575 } | 575 } |
| 576 | 576 |
| 577 } // namespace views | 577 } // namespace views |
| OLD | NEW |