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

Side by Side Diff: mojo/services/window_manager/window_manager_app.cc

Issue 640893003: Move mojo/services/public/cpp TypeConverters to mojo/converters. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix GN. Created 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "mojo/services/window_manager/window_manager_app.h" 5 #include "mojo/services/window_manager/window_manager_app.h"
6 6
7 #include "base/message_loop/message_loop.h" 7 #include "base/message_loop/message_loop.h"
8 #include "base/stl_util.h" 8 #include "base/stl_util.h"
9 #include "mojo/aura/aura_init.h" 9 #include "mojo/aura/aura_init.h"
10 #include "mojo/converters/input_events_type_converters.h"
10 #include "mojo/public/cpp/application/application_connection.h" 11 #include "mojo/public/cpp/application/application_connection.h"
11 #include "mojo/public/cpp/application/application_impl.h" 12 #include "mojo/public/cpp/application/application_impl.h"
12 #include "mojo/public/interfaces/application/shell.mojom.h" 13 #include "mojo/public/interfaces/application/shell.mojom.h"
13 #include "mojo/services/public/cpp/input_events/input_events_type_converters.h"
14 #include "mojo/services/public/cpp/view_manager/view.h" 14 #include "mojo/services/public/cpp/view_manager/view.h"
15 #include "mojo/services/public/cpp/view_manager/view_manager.h" 15 #include "mojo/services/public/cpp/view_manager/view_manager.h"
16 #include "ui/aura/window.h" 16 #include "ui/aura/window.h"
17 #include "ui/aura/window_delegate.h" 17 #include "ui/aura/window_delegate.h"
18 #include "ui/aura/window_property.h" 18 #include "ui/aura/window_property.h"
19 #include "ui/base/hit_test.h" 19 #include "ui/base/hit_test.h"
20 #include "ui/wm/core/capture_controller.h" 20 #include "ui/wm/core/capture_controller.h"
21 #include "ui/wm/core/focus_controller.h" 21 #include "ui/wm/core/focus_controller.h"
22 #include "ui/wm/public/activation_client.h" 22 #include "ui/wm/public/activation_client.h"
23 23
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 ViewIdToWindowMap::iterator it = view_id_to_window_map_.find(view->id()); 328 ViewIdToWindowMap::iterator it = view_id_to_window_map_.find(view->id());
329 DCHECK(it != view_id_to_window_map_.end()); 329 DCHECK(it != view_id_to_window_map_.end());
330 scoped_ptr<aura::Window> window(it->second); 330 scoped_ptr<aura::Window> window(it->second);
331 view_id_to_window_map_.erase(it); 331 view_id_to_window_map_.erase(it);
332 View::Children::const_iterator child = view->children().begin(); 332 View::Children::const_iterator child = view->children().begin();
333 for (; child != view->children().end(); ++child) 333 for (; child != view->children().end(); ++child)
334 UnregisterSubtree(*child); 334 UnregisterSubtree(*child);
335 } 335 }
336 336
337 } // namespace mojo 337 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698