content/browser/media/session/media_session_controller.cc - 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.cc

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

Patch Set: rebase Created 4 years, 9 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

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

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

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

similarity index 97%

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

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

index f5ff8aac310fb62e66ad6c2440035d7bc0f52d2a..00ba5a91f88da6ed730204bdead09042b8a7e773 100644

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

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

@@ -2,10 +2,10 @@

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

// found in the LICENSE file.

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

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

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

#include "content/browser/media/media_web_contents_observer.h"

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

#include "content/common/media/media_player_delegate_messages.h"

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

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