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

Unified Diff: mojo/services/view_manager/root_node_manager.cc

Issue 474883003: Move focus from the view manager to the window manager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 4 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/services/view_manager/root_node_manager.h ('k') | mojo/services/view_manager/root_view_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/services/view_manager/root_node_manager.cc
diff --git a/mojo/services/view_manager/root_node_manager.cc b/mojo/services/view_manager/root_node_manager.cc
index caf0b381dc661ea5c7a02b5ae8a585f8702d2df8..03a81d294317c2293c139f8918b91d05311c736a 100644
--- a/mojo/services/view_manager/root_node_manager.cc
+++ b/mojo/services/view_manager/root_node_manager.cc
@@ -9,7 +9,6 @@
#include "mojo/public/interfaces/application/service_provider.mojom.h"
#include "mojo/services/public/cpp/input_events/input_events_type_converters.h"
#include "mojo/services/view_manager/view_manager_service_impl.h"
-#include "ui/aura/client/focus_client.h"
#include "ui/aura/env.h"
namespace mojo {
@@ -53,9 +52,6 @@ RootNodeManager::RootNodeManager(
}
RootNodeManager::~RootNodeManager() {
- aura::client::FocusClient* focus_client =
- aura::client::GetFocusClient(root_->window());
- focus_client->RemoveObserver(this);
while (!connections_created_by_connect_.empty())
delete *(connections_created_by_connect_.begin());
// All the connections should have been destroyed.
@@ -152,17 +148,13 @@ const ViewManagerServiceImpl* RootNodeManager::GetConnectionWithRoot(
return NULL;
}
-void RootNodeManager::DispatchNodeInputEventToWindowManager(
- const Node* node,
- const ui::Event* event) {
+void RootNodeManager::DispatchNodeInputEventToWindowManager(EventPtr event) {
// Input events are forwarded to the WindowManager. The WindowManager
// eventually calls back to us with DispatchOnViewInputEvent().
ViewManagerServiceImpl* connection = GetConnection(kWindowManagerConnection);
if (!connection)
return;
- connection->client()->DispatchOnViewInputEvent(
- NodeIdToTransportId(node->id()),
- TypeConverter<EventPtr, ui::Event>::ConvertFrom(*event));
+ connection->client()->DispatchOnViewInputEvent(event.Pass());
}
void RootNodeManager::ProcessNodeBoundsChanged(const Node* node,
@@ -202,17 +194,6 @@ void RootNodeManager::ProcessNodeDeleted(const NodeId& node) {
}
}
-void RootNodeManager::OnWindowFocused(aura::Window* gained_focus,
- aura::Window* lost_focus) {
- Node* focused_node = gained_focus ? Node::NodeForWindow(gained_focus) : NULL;
- Node* blurred_node = lost_focus ? Node::NodeForWindow(lost_focus) : NULL;
- for (ConnectionMap::iterator i = connection_map_.begin();
- i != connection_map_.end(); ++i) {
- i->second->ProcessFocusChanged(focused_node, blurred_node,
- IsChangeSource(i->first));
- }
-}
-
void RootNodeManager::PrepareForChange(ScopedChange* change) {
// Should only ever have one change in flight.
CHECK(!current_change_);
@@ -273,10 +254,5 @@ void RootNodeManager::OnNodeBoundsChanged(const Node* node,
ProcessNodeBoundsChanged(node, old_bounds, new_bounds);
}
-void RootNodeManager::OnNodeInputEvent(const Node* node,
- const ui::Event* event) {
- DispatchNodeInputEventToWindowManager(node, event);
-}
-
} // namespace service
} // namespace mojo
« no previous file with comments | « mojo/services/view_manager/root_node_manager.h ('k') | mojo/services/view_manager/root_view_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698