chrome/browser/media/webrtc/media_stream_infobar_delegate_android.h - Issue 2415863002: Use PermissionType instead of ContentSettingsType in Android permission infobars

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.h

Issue 2415863002: Use PermissionType instead of ContentSettingsType in Android permission infobars (Closed)

Patch Set: Merge branch 'master' into use_permission_type_for_infobar Created 4 years, 2 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

« chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java ('K') | « chrome/browser/media/protected_media_identifier_infobar_delegate_android.cc ('k') | chrome/browser/media/webrtc/media_stream_infobar_delegate_android.cc » ('j') | chrome/browser/ui/android/infobars/permission_infobar.cc » ('J')
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 #ifndef CHROME_BROWSER_MEDIA_WEBRTC_MEDIA_STREAM_INFOBAR_DELEGATE_ANDROID_H_	5 #ifndef CHROME_BROWSER_MEDIA_WEBRTC_MEDIA_STREAM_INFOBAR_DELEGATE_ANDROID_H_

6 #define CHROME_BROWSER_MEDIA_WEBRTC_MEDIA_STREAM_INFOBAR_DELEGATE_ANDROID_H_	6 #define CHROME_BROWSER_MEDIA_WEBRTC_MEDIA_STREAM_INFOBAR_DELEGATE_ANDROID_H_

7	7

8 #include <string>	8 #include <string>

9	9

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

(...skipping 30 matching lines...) Expand all Loading...
41 void InfoBarDismissed() override;	41 void InfoBarDismissed() override;

42 MediaStreamInfoBarDelegateAndroid* AsMediaStreamInfoBarDelegateAndroid()	42 MediaStreamInfoBarDelegateAndroid* AsMediaStreamInfoBarDelegateAndroid()

43 override;	43 override;

44 base::string16 GetMessageText() const override;	44 base::string16 GetMessageText() const override;

45 base::string16 GetButtonLabel(InfoBarButton button) const override;	45 base::string16 GetButtonLabel(InfoBarButton button) const override;

46 bool Accept() override;	46 bool Accept() override;

47 bool Cancel() override;	47 bool Cancel() override;

48 base::string16 GetLinkText() const override;	48 base::string16 GetLinkText() const override;

49 GURL GetLinkURL() const override;	49 GURL GetLinkURL() const override;

50 int GetMessageResourceId() const override;	50 int GetMessageResourceId() const override;

51 std::vector<int> content_settings() const override;	51 std::vector<int> permission_types() const override;

52	52

53 std::unique_ptr<MediaStreamDevicesController> controller_;	53 std::unique_ptr<MediaStreamDevicesController> controller_;

54	54

55 DISALLOW_COPY_AND_ASSIGN(MediaStreamInfoBarDelegateAndroid);	55 DISALLOW_COPY_AND_ASSIGN(MediaStreamInfoBarDelegateAndroid);

56 };	56 };

57	57

58 #endif // CHROME_BROWSER_MEDIA_WEBRTC_MEDIA_STREAM_INFOBAR_DELEGATE_ANDROID_H_	58 #endif // CHROME_BROWSER_MEDIA_WEBRTC_MEDIA_STREAM_INFOBAR_DELEGATE_ANDROID_H_

OLD	NEW