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

Unified Diff: chrome/browser/media/media_stream_mic_permission_context_factory.h

Issue 1312453005: Removed Profile::GetHostContentSettingsMap (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed patch conflict Created 5 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/media/media_stream_mic_permission_context_factory.h
diff --git a/chrome/browser/media/media_stream_mic_permission_context_factory.h b/chrome/browser/media/media_stream_mic_permission_context_factory.h
index d00b58ec29279b89579a6f337a1f4b24963552b5..bacbc0e5c640ed7fbd01affbd8e4e6982e2a60a6 100644
--- a/chrome/browser/media/media_stream_mic_permission_context_factory.h
+++ b/chrome/browser/media/media_stream_mic_permission_context_factory.h
@@ -6,14 +6,14 @@
#define CHROME_BROWSER_MEDIA_MEDIA_STREAM_MIC_PERMISSION_CONTEXT_FACTORY_H_
#include "base/memory/singleton.h"
+#include "chrome/browser/permissions/permission_context_factory_base.h"
#include "components/content_settings/core/common/content_settings_types.h"
-#include "components/keyed_service/content/browser_context_keyed_service_factory.h"
class MediaStreamDevicePermissionContext;
class Profile;
class MediaStreamMicPermissionContextFactory
- : public BrowserContextKeyedServiceFactory {
+ : public PermissionContextFactoryBase {
public:
static MediaStreamDevicePermissionContext* GetForProfile(Profile* profile);
static MediaStreamMicPermissionContextFactory* GetInstance();
@@ -28,8 +28,6 @@ class MediaStreamMicPermissionContextFactory
// BrowserContextKeyedBaseFactory methods:
KeyedService* BuildServiceInstanceFor(
content::BrowserContext* profile) const override;
- content::BrowserContext* GetBrowserContextToUse(
- content::BrowserContext* context) const override;
DISALLOW_COPY_AND_ASSIGN(MediaStreamMicPermissionContextFactory);
};

Powered by Google App Engine
This is Rietveld 408576698