OLD | NEW |
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_PUBLIC_BROWSER_SCREEN_ORIENTATION_PROVIDER_H_ | 5 #ifndef CONTENT_PUBLIC_BROWSER_SCREEN_ORIENTATION_PROVIDER_H_ |
6 #define CONTENT_PUBLIC_BROWSER_SCREEN_ORIENTATION_PROVIDER_H_ | 6 #define CONTENT_PUBLIC_BROWSER_SCREEN_ORIENTATION_PROVIDER_H_ |
7 | 7 |
| 8 #include <memory> |
| 9 |
8 #include "base/macros.h" | 10 #include "base/macros.h" |
9 #include "base/memory/scoped_ptr.h" | |
10 #include "content/common/content_export.h" | 11 #include "content/common/content_export.h" |
11 #include "content/public/browser/web_contents_observer.h" | 12 #include "content/public/browser/web_contents_observer.h" |
12 #include "third_party/WebKit/public/platform/modules/screen_orientation/WebScree
nOrientationLockType.h" | 13 #include "third_party/WebKit/public/platform/modules/screen_orientation/WebScree
nOrientationLockType.h" |
13 | 14 |
14 namespace content { | 15 namespace content { |
15 | 16 |
16 class ScreenOrientationDelegate; | 17 class ScreenOrientationDelegate; |
17 class ScreenOrientationDispatcherHost; | 18 class ScreenOrientationDispatcherHost; |
18 class WebContents; | 19 class WebContents; |
19 | 20 |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
64 static ScreenOrientationDelegate* delegate_; | 65 static ScreenOrientationDelegate* delegate_; |
65 | 66 |
66 // ScreenOrientationDispatcherHost owns ScreenOrientationProvider. | 67 // ScreenOrientationDispatcherHost owns ScreenOrientationProvider. |
67 ScreenOrientationDispatcherHost* dispatcher_; | 68 ScreenOrientationDispatcherHost* dispatcher_; |
68 | 69 |
69 // Whether the ScreenOrientationProvider currently has a lock applied. | 70 // Whether the ScreenOrientationProvider currently has a lock applied. |
70 bool lock_applied_; | 71 bool lock_applied_; |
71 | 72 |
72 // Locks that require orientation changes are not completed until | 73 // Locks that require orientation changes are not completed until |
73 // OnOrientationChange. | 74 // OnOrientationChange. |
74 scoped_ptr<LockInformation> pending_lock_; | 75 std::unique_ptr<LockInformation> pending_lock_; |
75 | 76 |
76 DISALLOW_COPY_AND_ASSIGN(ScreenOrientationProvider); | 77 DISALLOW_COPY_AND_ASSIGN(ScreenOrientationProvider); |
77 }; | 78 }; |
78 | 79 |
79 } // namespace content | 80 } // namespace content |
80 | 81 |
81 #endif // CONTENT_PUBLIC_BROWSER_SCREEN_ORIENTATION_PROVIDER_H_ | 82 #endif // CONTENT_PUBLIC_BROWSER_SCREEN_ORIENTATION_PROVIDER_H_ |
OLD | NEW |