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

Side by Side Diff: content/renderer/screen_orientation/screen_orientation_dispatcher.h

Issue 2480293004: Mandate unique_ptr for base::IDMap in IDMapOwnPointer mode. (Closed)
Patch Set: Make changes requested by danakj, fix a few more headers Created 4 years 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 CONTENT_RENDERER_SCREEN_ORIENTATION_SCREEN_ORIENTATION_DISPATCHER_H_ 5 #ifndef CONTENT_RENDERER_SCREEN_ORIENTATION_SCREEN_ORIENTATION_DISPATCHER_H_
6 #define CONTENT_RENDERER_SCREEN_ORIENTATION_SCREEN_ORIENTATION_DISPATCHER_H_ 6 #define CONTENT_RENDERER_SCREEN_ORIENTATION_SCREEN_ORIENTATION_DISPATCHER_H_
7 7
8 #include <memory>
9 #include <utility>
10
8 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
9 #include "base/id_map.h" 12 #include "base/id_map.h"
10 #include "base/macros.h" 13 #include "base/macros.h"
11 #include "content/common/screen_orientation.mojom.h" 14 #include "content/common/screen_orientation.mojom.h"
12 #include "content/public/renderer/render_frame_observer.h" 15 #include "content/public/renderer/render_frame_observer.h"
13 #include "third_party/WebKit/public/platform/modules/screen_orientation/WebLockO rientationCallback.h" 16 #include "third_party/WebKit/public/platform/modules/screen_orientation/WebLockO rientationCallback.h"
14 #include "third_party/WebKit/public/platform/modules/screen_orientation/WebScree nOrientationClient.h" 17 #include "third_party/WebKit/public/platform/modules/screen_orientation/WebScree nOrientationClient.h"
15 #include "third_party/WebKit/public/platform/modules/screen_orientation/WebScree nOrientationLockType.h" 18 #include "third_party/WebKit/public/platform/modules/screen_orientation/WebScree nOrientationLockType.h"
16 #include "third_party/WebKit/public/platform/modules/screen_orientation/WebScree nOrientationType.h" 19 #include "third_party/WebKit/public/platform/modules/screen_orientation/WebScree nOrientationType.h"
17 20
(...skipping 15 matching lines...) Expand all
33 explicit ScreenOrientationDispatcher(RenderFrame* render_frame); 36 explicit ScreenOrientationDispatcher(RenderFrame* render_frame);
34 ~ScreenOrientationDispatcher() override; 37 ~ScreenOrientationDispatcher() override;
35 38
36 private: 39 private:
37 friend class ScreenOrientationDispatcherTest; 40 friend class ScreenOrientationDispatcherTest;
38 41
39 // RenderFrameObserver implementation. 42 // RenderFrameObserver implementation.
40 void OnDestruct() override; 43 void OnDestruct() override;
41 44
42 // blink::WebScreenOrientationClient implementation. 45 // blink::WebScreenOrientationClient implementation.
43 void lockOrientation(blink::WebScreenOrientationLockType orientation, 46 void lockOrientation(
44 blink::WebLockOrientationCallback* callback) override; 47 blink::WebScreenOrientationLockType orientation,
48 std::unique_ptr<blink::WebLockOrientationCallback> callback) override;
45 void unlockOrientation() override; 49 void unlockOrientation() override;
46 50
47 void OnLockOrientationResult(int request_id, 51 void OnLockOrientationResult(int request_id,
48 ScreenOrientationLockResult result); 52 ScreenOrientationLockResult result);
49 53
50 void CancelPendingLocks(); 54 void CancelPendingLocks();
51 55
52 int GetRequestIdForTests(); 56 int GetRequestIdForTests();
53 57
54 void EnsureScreenOrientationService(); 58 void EnsureScreenOrientationService();
(...skipping 13 matching lines...) Expand all
68 CallbackMap pending_callbacks_; 72 CallbackMap pending_callbacks_;
69 73
70 ScreenOrientationAssociatedPtr screen_orientation_; 74 ScreenOrientationAssociatedPtr screen_orientation_;
71 75
72 DISALLOW_COPY_AND_ASSIGN(ScreenOrientationDispatcher); 76 DISALLOW_COPY_AND_ASSIGN(ScreenOrientationDispatcher);
73 }; 77 };
74 78
75 } // namespace content 79 } // namespace content
76 80
77 #endif // CONTENT_RENDERER_SCREEN_ORIENTATION_SCREEN_ORIENTATION_DISPATCHER_H_ 81 #endif // CONTENT_RENDERER_SCREEN_ORIENTATION_SCREEN_ORIENTATION_DISPATCHER_H_
OLDNEW
« no previous file with comments | « content/renderer/renderer_blink_platform_impl.cc ('k') | content/renderer/screen_orientation/screen_orientation_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698