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

Unified Diff: chrome/test/testing_profile.h

Issue 650180: Initial Geolocation location bar icons. (Closed)
Patch Set: Addresses Peter and Brett's comments. Created 10 years, 9 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
« no previous file with comments | « chrome/common/content_settings_types.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/testing_profile.h
diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h
index 214d70af72d24a0db2471621d4ffdec692f1fc7c..c56bbf3c00d7d87609c22c5eced9f9456f4c05e0 100644
--- a/chrome/test/testing_profile.h
+++ b/chrome/test/testing_profile.h
@@ -12,6 +12,7 @@
#include "chrome/browser/browser_prefs.h"
#include "chrome/browser/browser_theme_provider.h"
#include "chrome/browser/favicon_service.h"
+#include "chrome/browser/geolocation/geolocation_permission_context.h"
#include "chrome/browser/host_content_settings_map.h"
#include "chrome/browser/history/history.h"
#include "chrome/browser/in_process_webkit/webkit_context.h"
@@ -190,6 +191,13 @@ class TestingProfile : public Profile {
host_content_settings_map_ = new HostContentSettingsMap(this);
return host_content_settings_map_.get();
}
+ virtual GeolocationPermissionContext* GetGeolocationPermissionContext() {
+ if (!geolocation_permission_context_.get()) {
+ geolocation_permission_context_ =
+ new GeolocationPermissionContext(GetHostContentSettingsMap());
+ }
+ return geolocation_permission_context_.get();
+ }
virtual HostZoomMap* GetHostZoomMap() { return NULL; }
void set_session_service(SessionService* session_service);
virtual SessionService* GetSessionService() { return session_service_.get(); }
@@ -315,6 +323,8 @@ class TestingProfile : public Profile {
scoped_refptr<WebKitContext> webkit_context_;
scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
+
+ scoped_refptr<GeolocationPermissionContext> geolocation_permission_context_;
};
// A profile that derives from another profile. This does not actually
« no previous file with comments | « chrome/common/content_settings_types.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698