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

Unified Diff: chrome/browser/profiles/off_the_record_profile_impl.h

Issue 9416070: Move creation and ownership of HostZoomMap to content instead of having every embedder do this. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix mac/cros browsertests Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/profiles/off_the_record_profile_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/off_the_record_profile_impl.h
===================================================================
--- chrome/browser/profiles/off_the_record_profile_impl.h (revision 122827)
+++ chrome/browser/profiles/off_the_record_profile_impl.h (working copy)
@@ -8,6 +8,7 @@
#include <string>
+#include "base/gtest_prod_util.h"
#include "chrome/browser/profiles/off_the_record_profile_io_data.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser_list.h"
@@ -113,7 +114,6 @@
int renderer_child_id) OVERRIDE;
virtual net::URLRequestContextGetter* GetRequestContextForMedia() OVERRIDE;
virtual content::ResourceContext* GetResourceContext() OVERRIDE;
- virtual content::HostZoomMap* GetHostZoomMap() OVERRIDE;
virtual content::GeolocationPermissionContext*
GetGeolocationPermissionContext() OVERRIDE;
virtual content::SpeechInputPreferences* GetSpeechInputPreferences() OVERRIDE;
@@ -126,6 +126,9 @@
const content::NotificationDetails& details) OVERRIDE;
private:
+ FRIEND_TEST_ALL_PREFIXES(OffTheRecordProfileImplTest, GetHostZoomMap);
+ void InitHostZoomMap();
+
content::NotificationRegistrar registrar_;
// The real underlying profile.
@@ -144,9 +147,6 @@
// We use a non-persistent content settings map for OTR.
scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
- // Use a separate zoom map for OTR.
- scoped_refptr<content::HostZoomMap> host_zoom_map_;
-
// Time we were started.
Time start_time_;
« no previous file with comments | « no previous file | chrome/browser/profiles/off_the_record_profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698