chrome/browser/media/webrtc/media_stream_infobar_delegate_android.cc - Issue 2307083002: Cleanup: move WebRTC related files from chrome/browser/media to chrome/browser/media/webrtc/

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/webrtc/media_stream_infobar_delegate_android.cc

Issue 2307083002: Cleanup: move WebRTC related files from chrome/browser/media to chrome/browser/media/webrtc/ (Closed)

Patch Set: Removed file wrongly resuscitated during rebase Created 4 years, 3 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

« no previous file with comments | « chrome/browser/media/webrtc/media_stream_infobar_delegate_android.h ('k') | chrome/browser/media/webrtc/native_desktop_media_list.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/media_stream_infobar_delegate_android.h"	5 #include "chrome/browser/media/webrtc/media_stream_infobar_delegate_android.h"

6	6

7 #include <stddef.h>	7 #include <stddef.h>

8 #include <utility>	8 #include <utility>

9	9

10 #include "base/logging.h"	10 #include "base/logging.h"

11 #include "base/metrics/histogram_macros.h"	11 #include "base/metrics/histogram_macros.h"

12 #include "base/strings/utf_string_conversions.h"	12 #include "base/strings/utf_string_conversions.h"

13 #include "chrome/browser/infobars/infobar_service.h"	13 #include "chrome/browser/infobars/infobar_service.h"

14 #include "chrome/common/url_constants.h"	14 #include "chrome/common/url_constants.h"

15 #include "components/content_settings/core/common/content_settings_types.h"	15 #include "components/content_settings/core/common/content_settings_types.h"

(...skipping 88 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
104 DCHECK_EQ(1, GetPermissionCount());	104 DCHECK_EQ(1, GetPermissionCount());

105 controller_->PermissionGranted();	105 controller_->PermissionGranted();

106 }	106 }

107 return true;	107 return true;

108 }	108 }

109	109

110 bool MediaStreamInfoBarDelegateAndroid::Cancel() {	110 bool MediaStreamInfoBarDelegateAndroid::Cancel() {

111 controller_->PermissionDenied();	111 controller_->PermissionDenied();

112 return true;	112 return true;

113 }	113 }

OLD	NEW