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

Side by Side Diff: ui/aura/mus/window_tree_client.cc

Issue 2603893002: Remove mojo::Map. (Closed)
Patch Set: Created 3 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 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 "ui/aura/mus/window_tree_client.h" 5 #include "ui/aura/mus/window_tree_client.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/auto_reset.h" 13 #include "base/auto_reset.h"
14 #include "base/bind.h" 14 #include "base/bind.h"
15 #include "base/memory/ptr_util.h" 15 #include "base/memory/ptr_util.h"
16 #include "mojo/public/cpp/bindings/map.h"
16 #include "services/service_manager/public/cpp/connector.h" 17 #include "services/service_manager/public/cpp/connector.h"
17 #include "services/ui/common/accelerator_util.h" 18 #include "services/ui/common/accelerator_util.h"
18 #include "services/ui/public/cpp/property_type_converters.h" 19 #include "services/ui/public/cpp/property_type_converters.h"
19 #include "services/ui/public/interfaces/constants.mojom.h" 20 #include "services/ui/public/interfaces/constants.mojom.h"
20 #include "services/ui/public/interfaces/window_manager.mojom.h" 21 #include "services/ui/public/interfaces/window_manager.mojom.h"
21 #include "services/ui/public/interfaces/window_manager_window_tree_factory.mojom .h" 22 #include "services/ui/public/interfaces/window_manager_window_tree_factory.mojom .h"
22 #include "ui/aura/client/aura_constants.h" 23 #include "ui/aura/client/aura_constants.h"
23 #include "ui/aura/client/drag_drop_client.h" 24 #include "ui/aura/client/drag_drop_client.h"
24 #include "ui/aura/client/transient_window_client.h" 25 #include "ui/aura/client/transient_window_client.h"
25 #include "ui/aura/mus/capture_synchronizer.h" 26 #include "ui/aura/mus/capture_synchronizer.h"
(...skipping 1672 matching lines...) Expand 10 before | Expand all | Expand 10 after
1698 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>( 1699 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>(
1699 this, capture_synchronizer_.get(), window)); 1700 this, capture_synchronizer_.get(), window));
1700 } 1701 }
1701 1702
1702 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) { 1703 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) {
1703 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>( 1704 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>(
1704 this, focus_synchronizer_.get(), window)); 1705 this, focus_synchronizer_.get(), window));
1705 } 1706 }
1706 1707
1707 } // namespace aura 1708 } // namespace aura
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698