chrome/browser/media/android/router/media_router_dialog_controller_android.cc - Issue 2771413003: Move c/b/media/router/mojo/*.mojom to chrome/common/media_router/mojo/*.mojom

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/media/android/router/media_router_dialog_controller_android.cc

Issue 2771413003: Move c/b/media/router/mojo/*.mojom to chrome/common/media_router/mojo/*.mojom (Closed)

Patch Set: Rebase Created 3 years, 8 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

OLD	NEW
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 #include "chrome/browser/media/android/router/media_router_dialog_controller_and roid.h"	5 #include "chrome/browser/media/android/router/media_router_dialog_controller_and roid.h"

6	6

7 #include "base/android/jni_android.h"	7 #include "base/android/jni_android.h"

8 #include "base/android/jni_string.h"	8 #include "base/android/jni_string.h"

9 #include "chrome/browser/media/android/router/media_router_android.h"	9 #include "chrome/browser/media/android/router/media_router_android.h"

10 #include "chrome/browser/media/router/media_router.h"	10 #include "chrome/browser/media/router/media_router.h"

11 #include "chrome/browser/media/router/media_router_factory.h"	11 #include "chrome/browser/media/router/media_router_factory.h"

12 #include "chrome/browser/media/router/media_source.h"

13 #include "chrome/browser/media/router/presentation_request.h"	12 #include "chrome/browser/media/router/presentation_request.h"

	13 #include "chrome/common/media_router/media_source.h"

14 #include "content/public/browser/browser_context.h"	14 #include "content/public/browser/browser_context.h"

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

16 #include "content/public/browser/web_contents.h"	16 #include "content/public/browser/web_contents.h"

17 #include "content/public/browser/web_contents_delegate.h"	17 #include "content/public/browser/web_contents_delegate.h"

18 #include "jni/ChromeMediaRouterDialogController_jni.h"	18 #include "jni/ChromeMediaRouterDialogController_jni.h"

19	19

20 DEFINE_WEB_CONTENTS_USER_DATA_KEY(	20 DEFINE_WEB_CONTENTS_USER_DATA_KEY(

21 media_router::MediaRouterDialogControllerAndroid);	21 media_router::MediaRouterDialogControllerAndroid);

22	22

23 using base::android::ConvertJavaStringToUTF8;	23 using base::android::ConvertJavaStringToUTF8;

(...skipping 144 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
168 }	168 }

169	169

170 bool MediaRouterDialogControllerAndroid::IsShowingMediaRouterDialog() const {	170 bool MediaRouterDialogControllerAndroid::IsShowingMediaRouterDialog() const {

171 JNIEnv* env = base::android::AttachCurrentThread();	171 JNIEnv* env = base::android::AttachCurrentThread();

172 return Java_ChromeMediaRouterDialogController_isShowingDialog(	172 return Java_ChromeMediaRouterDialogController_isShowingDialog(

173 env, java_dialog_controller_);	173 env, java_dialog_controller_);

174 }	174 }

175	175

176 } // namespace media_router	176 } // namespace media_router

177	177

OLD	NEW