Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(173)

Unified Diff: mandoline/ui/aura/native_widget_view_manager.cc

Issue 1402213002: Moves mandoline/ui/aura to ui/views/mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: disable presubmit Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mandoline/ui/aura/native_widget_view_manager.h ('k') | mandoline/ui/aura/surface_binding.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mandoline/ui/aura/native_widget_view_manager.cc
diff --git a/mandoline/ui/aura/native_widget_view_manager.cc b/mandoline/ui/aura/native_widget_view_manager.cc
deleted file mode 100644
index 003aca96e139794b72cbe56540b5a27c41166f7b..0000000000000000000000000000000000000000
--- a/mandoline/ui/aura/native_widget_view_manager.cc
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright 2015 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 "mandoline/ui/aura/native_widget_view_manager.h"
-
-#include "components/mus/public/cpp/view.h"
-#include "mandoline/ui/aura/input_method_mandoline.h"
-#include "mandoline/ui/aura/window_tree_host_mojo.h"
-#include "mojo/converters/geometry/geometry_type_converters.h"
-#include "mojo/converters/input_events/input_events_type_converters.h"
-#include "ui/aura/client/default_capture_client.h"
-#include "ui/aura/window.h"
-#include "ui/aura/window_event_dispatcher.h"
-#include "ui/base/ime/input_method_delegate.h"
-#include "ui/wm/core/base_focus_rules.h"
-#include "ui/wm/core/capture_controller.h"
-#include "ui/wm/core/focus_controller.h"
-
-namespace mandoline {
-namespace {
-
-// TODO: figure out what this should be.
-class FocusRulesImpl : public wm::BaseFocusRules {
- public:
- FocusRulesImpl() {}
- ~FocusRulesImpl() override {}
-
- bool SupportsChildActivation(aura::Window* window) const override {
- return true;
- }
-
- private:
- DISALLOW_COPY_AND_ASSIGN(FocusRulesImpl);
-};
-
-class NativeWidgetViewObserver : public mus::ViewObserver {
- public:
- NativeWidgetViewObserver(NativeWidgetViewManager* view_manager)
- : view_manager_(view_manager) {
- view_manager_->view_->AddObserver(this);
- }
-
- ~NativeWidgetViewObserver() override {
- if (view_manager_->view_)
- view_manager_->view_->RemoveObserver(this);
- }
-
- private:
- // ViewObserver:
- void OnViewDestroyed(mus::View* view) override {
- DCHECK_EQ(view, view_manager_->view_);
- view->RemoveObserver(this);
- view_manager_->view_ = nullptr;
- // TODO(sky): WindowTreeHostMojo assumes the View outlives it.
- // NativeWidgetViewObserver needs to deal, likely by deleting this.
- }
-
- void OnViewBoundsChanged(mus::View* view,
- const mojo::Rect& old_bounds,
- const mojo::Rect& new_bounds) override {
- gfx::Rect view_rect = view->bounds().To<gfx::Rect>();
- view_manager_->SetBounds(gfx::Rect(view_rect.size()));
- }
-
- void OnViewFocusChanged(mus::View* gained_focus,
- mus::View* lost_focus) override {
- if (gained_focus == view_manager_->view_)
- view_manager_->window_tree_host_->GetInputMethod()->OnFocus();
- else if (lost_focus == view_manager_->view_)
- view_manager_->window_tree_host_->GetInputMethod()->OnBlur();
- }
-
- void OnViewInputEvent(mus::View* view, const mojo::EventPtr& event) override {
- scoped_ptr<ui::Event> ui_event(event.To<scoped_ptr<ui::Event>>());
- if (!ui_event)
- return;
-
- if (ui_event->IsKeyEvent()) {
- view_manager_->window_tree_host_->GetInputMethod()->DispatchKeyEvent(
- static_cast<ui::KeyEvent*>(ui_event.get()));
- } else {
- view_manager_->window_tree_host_->SendEventToProcessor(ui_event.get());
- }
- }
-
- NativeWidgetViewManager* const view_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(NativeWidgetViewObserver);
-};
-
-} // namespace
-
-NativeWidgetViewManager::NativeWidgetViewManager(
- views::internal::NativeWidgetDelegate* delegate,
- mojo::Shell* shell,
- mus::View* view)
- : NativeWidgetAura(delegate), view_(view) {
- window_tree_host_.reset(new WindowTreeHostMojo(shell, view_));
- window_tree_host_->InitHost();
-
- focus_client_.reset(new wm::FocusController(new FocusRulesImpl));
-
- aura::client::SetFocusClient(window_tree_host_->window(),
- focus_client_.get());
- aura::client::SetActivationClient(window_tree_host_->window(),
- focus_client_.get());
- window_tree_host_->window()->AddPreTargetHandler(focus_client_.get());
-
- capture_client_.reset(
- new aura::client::DefaultCaptureClient(window_tree_host_->window()));
-
- view_observer_.reset(new NativeWidgetViewObserver(this));
-}
-
-NativeWidgetViewManager::~NativeWidgetViewManager() {}
-
-void NativeWidgetViewManager::InitNativeWidget(
- const views::Widget::InitParams& in_params) {
- views::Widget::InitParams params(in_params);
- params.parent = window_tree_host_->window();
- NativeWidgetAura::InitNativeWidget(params);
-}
-
-void NativeWidgetViewManager::OnWindowVisibilityChanged(aura::Window* window,
- bool visible) {
- view_->SetVisible(visible);
- // NOTE: We could also update aura::Window's visibility when the View's
- // visibility changes, but this code isn't going to be around for very long so
- // I'm not bothering.
-}
-
-} // namespace mandoline
« no previous file with comments | « mandoline/ui/aura/native_widget_view_manager.h ('k') | mandoline/ui/aura/surface_binding.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698