Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1011)

Side by Side Diff: chrome/browser/media/media_stream_devices_controller.h

Issue 176053002: [WebsiteSettings] Change permission bubble API to adapt to new mocks. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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 | Annotate | Revision Log
OLDNEW
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_MEDIA_STREAM_DEVICES_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_MEDIA_MEDIA_STREAM_DEVICES_CONTROLLER_H_
6 #define CHROME_BROWSER_MEDIA_MEDIA_STREAM_DEVICES_CONTROLLER_H_ 6 #define CHROME_BROWSER_MEDIA_MEDIA_STREAM_DEVICES_CONTROLLER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 bool DismissInfoBarAndTakeActionOnSettings(); 65 bool DismissInfoBarAndTakeActionOnSettings();
66 66
67 // Public methods to be called by MediaStreamInfoBarDelegate; 67 // Public methods to be called by MediaStreamInfoBarDelegate;
68 bool HasAudio() const; 68 bool HasAudio() const;
69 bool HasVideo() const; 69 bool HasVideo() const;
70 const std::string& GetSecurityOriginSpec() const; 70 const std::string& GetSecurityOriginSpec() const;
71 void Accept(bool update_content_setting); 71 void Accept(bool update_content_setting);
72 void Deny(bool update_content_setting); 72 void Deny(bool update_content_setting);
73 73
74 // PermissionBubbleRequest: 74 // PermissionBubbleRequest:
75 virtual int GetIconID() const OVERRIDE;
75 virtual base::string16 GetMessageText() const OVERRIDE; 76 virtual base::string16 GetMessageText() const OVERRIDE;
76 virtual base::string16 GetMessageTextFragment() const OVERRIDE; 77 virtual base::string16 GetMessageTextFragment() const OVERRIDE;
77 virtual base::string16 GetAlternateAcceptButtonText() const OVERRIDE; 78 virtual bool HasUserGesture() const OVERRIDE;
78 virtual base::string16 GetAlternateDenyButtonText() const OVERRIDE;
79 virtual void PermissionGranted() OVERRIDE; 79 virtual void PermissionGranted() OVERRIDE;
80 virtual void PermissionDenied() OVERRIDE; 80 virtual void PermissionDenied() OVERRIDE;
81 virtual void Cancelled() OVERRIDE; 81 virtual void Cancelled() OVERRIDE;
82 virtual void RequestFinished() OVERRIDE; 82 virtual void RequestFinished() OVERRIDE;
83 83
84 private: 84 private:
85 enum DevicePolicy { 85 enum DevicePolicy {
86 POLICY_NOT_SET, 86 POLICY_NOT_SET,
87 ALWAYS_DENY, 87 ALWAYS_DENY,
88 ALWAYS_ALLOW, 88 ALWAYS_ALLOW,
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 // passed to the tab specific content settings when the permissions have been 159 // passed to the tab specific content settings when the permissions have been
160 // resolved. Currently only used by MEDIA_DEVICE_AUDIO_CAPTURE and 160 // resolved. Currently only used by MEDIA_DEVICE_AUDIO_CAPTURE and
161 // MEDIA_DEVICE_VIDEO_CAPTURE since those are the only types that require 161 // MEDIA_DEVICE_VIDEO_CAPTURE since those are the only types that require
162 // updates in the settings. 162 // updates in the settings.
163 MediaStreamTypeSettingsMap request_permissions_; 163 MediaStreamTypeSettingsMap request_permissions_;
164 164
165 DISALLOW_COPY_AND_ASSIGN(MediaStreamDevicesController); 165 DISALLOW_COPY_AND_ASSIGN(MediaStreamDevicesController);
166 }; 166 };
167 167
168 #endif // CHROME_BROWSER_MEDIA_MEDIA_STREAM_DEVICES_CONTROLLER_H_ 168 #endif // CHROME_BROWSER_MEDIA_MEDIA_STREAM_DEVICES_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698