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

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

Issue 633303002: Replace FINAL and OVERRIDE with their C++11 counterparts in content/renderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 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 "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/id_map.h" 9 #include "base/id_map.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 15 matching lines...) Expand all
26 public RenderFrameObserver, 26 public RenderFrameObserver,
27 NON_EXPORTED_BASE(public blink::WebScreenOrientationClient) { 27 NON_EXPORTED_BASE(public blink::WebScreenOrientationClient) {
28 public: 28 public:
29 explicit ScreenOrientationDispatcher(RenderFrame* render_frame); 29 explicit ScreenOrientationDispatcher(RenderFrame* render_frame);
30 virtual ~ScreenOrientationDispatcher(); 30 virtual ~ScreenOrientationDispatcher();
31 31
32 private: 32 private:
33 friend class ScreenOrientationDispatcherTest; 33 friend class ScreenOrientationDispatcherTest;
34 34
35 // RenderFrameObserver implementation. 35 // RenderFrameObserver implementation.
36 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; 36 virtual bool OnMessageReceived(const IPC::Message& message) override;
37 37
38 // blink::WebScreenOrientationClient implementation. 38 // blink::WebScreenOrientationClient implementation.
39 virtual void lockOrientation( 39 virtual void lockOrientation(
40 blink::WebScreenOrientationLockType orientation, 40 blink::WebScreenOrientationLockType orientation,
41 blink::WebLockOrientationCallback* callback) OVERRIDE; 41 blink::WebLockOrientationCallback* callback) override;
42 virtual void unlockOrientation() OVERRIDE; 42 virtual void unlockOrientation() override;
43 43
44 void OnLockSuccess(int request_id); 44 void OnLockSuccess(int request_id);
45 void OnLockError(int request_id, 45 void OnLockError(int request_id,
46 blink::WebLockOrientationError error); 46 blink::WebLockOrientationError error);
47 47
48 void CancelPendingLocks(); 48 void CancelPendingLocks();
49 49
50 // The pending_callbacks_ map is mostly meant to have a unique ID to associate 50 // The pending_callbacks_ map is mostly meant to have a unique ID to associate
51 // with every callback going trough the dispatcher. The map will own the 51 // with every callback going trough the dispatcher. The map will own the
52 // pointer in the sense that it will destroy it when Remove() will be called. 52 // pointer in the sense that it will destroy it when Remove() will be called.
53 // Furthermore, we only expect to have one callback at a time in this map, 53 // Furthermore, we only expect to have one callback at a time in this map,
54 // which is what IDMap was designed for. 54 // which is what IDMap was designed for.
55 typedef IDMap<blink::WebLockOrientationCallback, IDMapOwnPointer> CallbackMap; 55 typedef IDMap<blink::WebLockOrientationCallback, IDMapOwnPointer> CallbackMap;
56 CallbackMap pending_callbacks_; 56 CallbackMap pending_callbacks_;
57 57
58 DISALLOW_COPY_AND_ASSIGN(ScreenOrientationDispatcher); 58 DISALLOW_COPY_AND_ASSIGN(ScreenOrientationDispatcher);
59 }; 59 };
60 60
61 } // namespace content 61 } // namespace content
62 62
63 #endif // CONTENT_RENDERER_SCREEN_ORIENTATION_SCREEN_ORIENTATION_DISPATCHER_H_ 63 #endif // CONTENT_RENDERER_SCREEN_ORIENTATION_SCREEN_ORIENTATION_DISPATCHER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698