diff options
| author | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-10 06:39:53 +0000 |
|---|---|---|
| committer | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-10 06:39:53 +0000 |
| commit | d23cdeee7491760098a36fd79e192500d8722570 (patch) | |
| tree | 0859897b2b19b20059a0f726a151ffe26536d543 /chrome/browser/media/media_stream_devices_controller.h | |
| parent | 6b81e34b959bf55750a4960adc7e952a497087c1 (diff) | |
| download | chromium_src-d23cdeee7491760098a36fd79e192500d8722570.zip chromium_src-d23cdeee7491760098a36fd79e192500d8722570.tar.gz chromium_src-d23cdeee7491760098a36fd79e192500d8722570.tar.bz2 | |
[WebsiteSettings] Change permission bubble API to adapt to new mocks.
This adds cancellation ability for the clients that will need it. Adds
user gesture awareness to the API. Removes button customization. Adds icons.
Some code reorganization as well.
R=leng@google.com
BUG=332115
Review URL: https://codereview.chromium.org/176053002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255889 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/media/media_stream_devices_controller.h')
| -rw-r--r-- | chrome/browser/media/media_stream_devices_controller.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/media/media_stream_devices_controller.h b/chrome/browser/media/media_stream_devices_controller.h index 2666882..1da55bd 100644 --- a/chrome/browser/media/media_stream_devices_controller.h +++ b/chrome/browser/media/media_stream_devices_controller.h @@ -72,10 +72,11 @@ class MediaStreamDevicesController : public PermissionBubbleRequest { void Deny(bool update_content_setting); // PermissionBubbleRequest: + virtual int GetIconID() const OVERRIDE; virtual base::string16 GetMessageText() const OVERRIDE; virtual base::string16 GetMessageTextFragment() const OVERRIDE; - virtual base::string16 GetAlternateAcceptButtonText() const OVERRIDE; - virtual base::string16 GetAlternateDenyButtonText() const OVERRIDE; + virtual bool HasUserGesture() const OVERRIDE; + virtual GURL GetRequestingHostname() const OVERRIDE; virtual void PermissionGranted() OVERRIDE; virtual void PermissionDenied() OVERRIDE; virtual void Cancelled() OVERRIDE; |