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

Side by Side Diff: components/mus/ws/display_manager.h

Issue 1502373009: Allow std::unordered_*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase, more HashPair -> HashInts Created 4 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 #ifndef COMPONENTS_MUS_WS_DISPLAY_MANAGER_H_ 5 #ifndef COMPONENTS_MUS_WS_DISPLAY_MANAGER_H_
6 #define COMPONENTS_MUS_WS_DISPLAY_MANAGER_H_ 6 #define COMPONENTS_MUS_WS_DISPLAY_MANAGER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
11 11
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
15 #include "base/strings/string16.h"
15 #include "base/timer/timer.h" 16 #include "base/timer/timer.h"
16 #include "build/build_config.h" 17 #include "build/build_config.h"
17 #include "components/mus/public/interfaces/window_tree.mojom.h" 18 #include "components/mus/public/interfaces/window_tree.mojom.h"
18 #include "components/mus/ws/display_manager_delegate.h" 19 #include "components/mus/ws/display_manager_delegate.h"
19 #include "mojo/public/cpp/bindings/callback.h" 20 #include "mojo/public/cpp/bindings/callback.h"
20 #include "ui/gfx/geometry/rect.h" 21 #include "ui/gfx/geometry/rect.h"
21 #include "ui/platform_window/platform_window_delegate.h" 22 #include "ui/platform_window/platform_window_delegate.h"
22 23
23 namespace cc { 24 namespace cc {
24 class CompositorFrame; 25 class CompositorFrame;
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 base::WeakPtrFactory<DefaultDisplayManager> weak_factory_; 164 base::WeakPtrFactory<DefaultDisplayManager> weak_factory_;
164 165
165 DISALLOW_COPY_AND_ASSIGN(DefaultDisplayManager); 166 DISALLOW_COPY_AND_ASSIGN(DefaultDisplayManager);
166 }; 167 };
167 168
168 } // namespace ws 169 } // namespace ws
169 170
170 } // namespace mus 171 } // namespace mus
171 172
172 #endif // COMPONENTS_MUS_WS_DISPLAY_MANAGER_H_ 173 #endif // COMPONENTS_MUS_WS_DISPLAY_MANAGER_H_
OLDNEW
« no previous file with comments | « components/favicon_base/favicon_util.cc ('k') | components/sync_bookmarks/bookmark_model_associator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698