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

Side by Side Diff: content/renderer/media/android/webmediasession_android.h

Issue 1504913002: Revert of Enforce marking "override" for functions overriding Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_MEDIA_ANDROID_WEBMEDIASESSION_ANDROID_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIASESSION_ANDROID_H_
6 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIASESSION_ANDROID_H_ 6 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIASESSION_ANDROID_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "content/common/content_export.h" 9 #include "content/common/content_export.h"
10 #include "third_party/WebKit/public/platform/modules/mediasession/WebMediaSessio n.h" 10 #include "third_party/WebKit/public/platform/modules/mediasession/WebMediaSessio n.h"
11 11
12 namespace content { 12 namespace content {
13 13
14 class RendererMediaSessionManager; 14 class RendererMediaSessionManager;
15 15
16 class CONTENT_EXPORT WebMediaSessionAndroid : public blink::WebMediaSession { 16 class CONTENT_EXPORT WebMediaSessionAndroid : public blink::WebMediaSession {
17 public: 17 public:
18 WebMediaSessionAndroid(RendererMediaSessionManager* session_manager); 18 WebMediaSessionAndroid(RendererMediaSessionManager* session_manager);
19 ~WebMediaSessionAndroid() override; 19 virtual ~WebMediaSessionAndroid() override;
20 20
21 void activate(blink::WebMediaSessionActivateCallback*) override; 21 void activate(blink::WebMediaSessionActivateCallback*) override;
22 void deactivate(blink::WebMediaSessionDeactivateCallback*) override; 22 void deactivate(blink::WebMediaSessionDeactivateCallback*) override;
23 23
24 private: 24 private:
25 RendererMediaSessionManager* const session_manager_; 25 RendererMediaSessionManager* const session_manager_;
26 int session_id_; 26 int session_id_;
27 27
28 DISALLOW_COPY_AND_ASSIGN(WebMediaSessionAndroid); 28 DISALLOW_COPY_AND_ASSIGN(WebMediaSessionAndroid);
29 }; 29 };
30 30
31 } // namespace content 31 } // namespace content
32 32
33 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIASESSION_ANDROID_H_ 33 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIASESSION_ANDROID_H_
OLDNEW
« no previous file with comments | « content/renderer/media/android/webmediaplayer_android.h ('k') | content/renderer/render_frame_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698