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

Unified Diff: mojo/views/native_widget_view_manager.cc

Issue 851853002: It is time. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Trying to reup because the last upload failed. Created 5 years, 11 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 | « mojo/views/native_widget_view_manager.h ('k') | mojo/views/views_init.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/views/native_widget_view_manager.cc
diff --git a/mojo/views/native_widget_view_manager.cc b/mojo/views/native_widget_view_manager.cc
deleted file mode 100644
index e463fda8d003b28fa4554ed3c1b4f366c82555d9..0000000000000000000000000000000000000000
--- a/mojo/views/native_widget_view_manager.cc
+++ /dev/null
@@ -1,164 +0,0 @@
-// Copyright 2014 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 "mojo/views/native_widget_view_manager.h"
-
-#include "mojo/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/aura_constants.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.h"
-#include "ui/base/ime/input_method_base.h"
-#include "ui/base/ime/input_method_delegate.h"
-#include "ui/base/ime/input_method_factory.h"
-#include "ui/base/ime/text_input_client.h"
-#include "ui/wm/core/base_focus_rules.h"
-#include "ui/wm/core/capture_controller.h"
-#include "ui/wm/core/focus_controller.h"
-
-#if defined(OS_LINUX)
-#include "mojo/views/input_method_mojo_linux.h"
-#endif
-
-namespace mojo {
-namespace {
-
-// TODO: figure out what this should be.
-class FocusRulesImpl : public wm::BaseFocusRules {
- public:
- FocusRulesImpl() {}
- virtual ~FocusRulesImpl() {}
-
- virtual bool SupportsChildActivation(aura::Window* window) const override {
- return true;
- }
-
- private:
- DISALLOW_COPY_AND_ASSIGN(FocusRulesImpl);
-};
-
-class MinimalInputEventFilter : public ui::internal::InputMethodDelegate,
- public ui::EventHandler {
- public:
- explicit MinimalInputEventFilter(aura::Window* root)
- : root_(root) {
- ui::InitializeInputMethodForTesting();
-#if defined(OS_LINUX)
- input_method_.reset(new InputMethodMojoLinux(this));
-#else
- input_method_ = ui::CreateInputMethod(this, gfx::kNullAcceleratedWidget);
-#endif
- input_method_->Init(true);
- root_->AddPreTargetHandler(this);
- root_->SetProperty(aura::client::kRootWindowInputMethodKey,
- input_method_.get());
- }
-
- virtual ~MinimalInputEventFilter() {
- root_->RemovePreTargetHandler(this);
- root_->SetProperty(aura::client::kRootWindowInputMethodKey,
- static_cast<ui::InputMethod*>(NULL));
- }
-
- private:
- // ui::EventHandler:
- virtual void OnKeyEvent(ui::KeyEvent* event) override {
- // See the comment in InputMethodEventFilter::OnKeyEvent() for details.
- if (event->IsTranslated()) {
- event->SetTranslated(false);
- } else {
- if (input_method_->DispatchKeyEvent(*event))
- event->StopPropagation();
- }
- }
-
- // ui::internal::InputMethodDelegate:
- virtual bool DispatchKeyEventPostIME(const ui::KeyEvent& event) override {
- // See the comment in InputMethodEventFilter::DispatchKeyEventPostIME() for
- // details.
- ui::KeyEvent aura_event(event);
- aura_event.SetTranslated(true);
- ui::EventDispatchDetails details =
- root_->GetHost()->dispatcher()->OnEventFromSource(&aura_event);
- return aura_event.handled() || details.dispatcher_destroyed;
- }
-
- aura::Window* root_;
- scoped_ptr<ui::InputMethod> input_method_;
-
- DISALLOW_COPY_AND_ASSIGN(MinimalInputEventFilter);
-};
-
-} // namespace
-
-NativeWidgetViewManager::NativeWidgetViewManager(
- views::internal::NativeWidgetDelegate* delegate,
- Shell* shell,
- View* view)
- : NativeWidgetAura(delegate), view_(view) {
- view_->AddObserver(this);
- window_tree_host_.reset(new WindowTreeHostMojo(shell, view_));
- window_tree_host_->InitHost();
-
- ime_filter_.reset(
- new MinimalInputEventFilter(window_tree_host_->window()));
-
- 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()));
-}
-
-NativeWidgetViewManager::~NativeWidgetViewManager() {
- if (view_)
- view_->RemoveObserver(this);
-}
-
-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
- // visibilty changes, but this code isn't going to be around for very long so
- // I'm not bothering.
-}
-
-void NativeWidgetViewManager::OnViewDestroyed(View* view) {
- DCHECK_EQ(view, view_);
- view->RemoveObserver(this);
- view_ = NULL;
- // TODO(sky): WindowTreeHostMojo assumes the View outlives it.
- // NativeWidgetViewManager needs to deal, likely by deleting this.
-}
-
-void NativeWidgetViewManager::OnViewBoundsChanged(View* view,
- const Rect& old_bounds,
- const Rect& new_bounds) {
- gfx::Rect view_rect = view->bounds().To<gfx::Rect>();
- GetWidget()->SetBounds(gfx::Rect(view_rect.size()));
-}
-
-void NativeWidgetViewManager::OnViewInputEvent(View* view,
- const EventPtr& event) {
- scoped_ptr<ui::Event> ui_event(event.To<scoped_ptr<ui::Event> >());
- if (ui_event)
- window_tree_host_->SendEventToProcessor(ui_event.get());
-}
-
-} // namespace mojo
« no previous file with comments | « mojo/views/native_widget_view_manager.h ('k') | mojo/views/views_init.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698