content/browser/media/session/media_session_controller.h - Issue 1698933004: Make MediaSession a runtime-enabled feature on Desktop.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/media/session/media_session_controller.h

Issue 1698933004: Make MediaSession a runtime-enabled feature on Desktop. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: with flag Created 4 years, 10 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 side-by-side diff with in-line comments

Download patch

« content/browser/media/session/media_session_browsertest.cc ('K') | « content/browser/media/session/media_session_browsertest.cc ('k') | content/browser/media/session/media_session_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/media/session/media_session_controller.h

diff --git a/content/browser/media/android/media_session_controller.h b/content/browser/media/session/media_session_controller.h

similarity index 90%

rename from content/browser/media/android/media_session_controller.h

rename to content/browser/media/session/media_session_controller.h

index 33b7d4f89ec6e66b8da36aa18d22daf37298f75c..edc0ce2fd527f43c741a558da524a9744a6731ea 100644

--- a/content/browser/media/android/media_session_controller.h

+++ b/content/browser/media/session/media_session_controller.h

@@ -2,11 +2,11 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#ifndef CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_SESSION_CONTROLLER_H_

-#define CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_SESSION_CONTROLLER_H_

+#ifndef CONTENT_BROWSER_MEDIA_SESSION_MEDIA_SESSION_CONTROLLER_H_

+#define CONTENT_BROWSER_MEDIA_SESSION_MEDIA_SESSION_CONTROLLER_H_

#include "base/time/time.h"

-#include "content/browser/media/android/media_session_observer.h"

+#include "content/browser/media/session/media_session_observer.h"

#include "content/common/content_export.h"

#include "content/public/browser/web_contents_observer.h"

@@ -66,4 +66,4 @@ class CONTENT_EXPORT MediaSessionController : public MediaSessionObserver {

} // namespace content

-#endif // CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_SESSION_CONTROLLER_H_

+#endif // CONTENT_BROWSER_MEDIA_SESSION_MEDIA_SESSION_CONTROLLER_H_