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

Side by Side Diff: components/mus/public/cpp/window.h

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 1 month 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 #ifndef COMPONENTS_MUS_PUBLIC_CPP_WINDOW_H_ 5 #ifndef COMPONENTS_MUS_PUBLIC_CPP_WINDOW_H_
6 #define COMPONENTS_MUS_PUBLIC_CPP_WINDOW_H_ 6 #define COMPONENTS_MUS_PUBLIC_CPP_WINDOW_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/observer_list.h" 12 #include "base/observer_list.h"
13 #include "components/mus/public/cpp/types.h" 13 #include "components/mus/public/cpp/types.h"
14 #include "components/mus/public/interfaces/mus_constants.mojom.h" 14 #include "components/mus/public/interfaces/mus_constants.mojom.h"
15 #include "components/mus/public/interfaces/surface_id.mojom.h" 15 #include "components/mus/public/interfaces/surface_id.mojom.h"
16 #include "components/mus/public/interfaces/window_tree.mojom.h" 16 #include "components/mus/public/interfaces/window_tree.mojom.h"
17 #include "mojo/application/public/interfaces/service_provider.mojom.h" 17 #include "mojo/application/public/interfaces/service_provider.mojom.h"
18 #include "third_party/mojo/src/mojo/public/cpp/bindings/array.h" 18 #include "mojo/public/cpp/bindings/array.h"
19 #include "third_party/mojo/src/mojo/public/cpp/system/macros.h" 19 #include "mojo/public/cpp/system/macros.h"
20 #include "ui/gfx/geometry/insets.h" 20 #include "ui/gfx/geometry/insets.h"
21 #include "ui/gfx/geometry/rect.h" 21 #include "ui/gfx/geometry/rect.h"
22 22
23 namespace gfx { 23 namespace gfx {
24 class Size; 24 class Size;
25 } 25 }
26 26
27 namespace mus { 27 namespace mus {
28 28
29 class ServiceProviderImpl; 29 class ServiceProviderImpl;
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 }; 292 };
293 293
294 std::map<const void*, Value> prop_map_; 294 std::map<const void*, Value> prop_map_;
295 295
296 MOJO_DISALLOW_COPY_AND_ASSIGN(Window); 296 MOJO_DISALLOW_COPY_AND_ASSIGN(Window);
297 }; 297 };
298 298
299 } // namespace mus 299 } // namespace mus
300 300
301 #endif // COMPONENTS_MUS_PUBLIC_CPP_WINDOW_H_ 301 #endif // COMPONENTS_MUS_PUBLIC_CPP_WINDOW_H_
OLDNEW
« no previous file with comments | « components/mus/public/cpp/tests/window_server_test_suite.h ('k') | components/mus/public/cpp/window_surface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698