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

Side by Side Diff: chrome/browser/profiles/off_the_record_profile_impl.h

Issue 18112018: Cleanup the UseSharedProxies preference. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added a missing member initializer. Created 7 years, 5 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_PROFILES_OFF_THE_RECORD_PROFILE_IMPL_H_ 5 #ifndef CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IMPL_H_
6 #define CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IMPL_H_ 6 #define CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/gtest_prod_util.h" 10 #include "base/gtest_prod_util.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 105
106 private: 106 private:
107 FRIEND_TEST_ALL_PREFIXES(OffTheRecordProfileImplTest, GetHostZoomMap); 107 FRIEND_TEST_ALL_PREFIXES(OffTheRecordProfileImplTest, GetHostZoomMap);
108 void InitHostZoomMap(); 108 void InitHostZoomMap();
109 109
110 #if defined(OS_ANDROID) || defined(OS_IOS) 110 #if defined(OS_ANDROID) || defined(OS_IOS)
111 void UseSystemProxy(); 111 void UseSystemProxy();
112 #endif // defined(OS_ANDROID) || defined(OS_IOS) 112 #endif // defined(OS_ANDROID) || defined(OS_IOS)
113 113
114 void OnZoomLevelChanged(const content::HostZoomMap::ZoomLevelChange& change); 114 void OnZoomLevelChanged(const content::HostZoomMap::ZoomLevelChange& change);
115 PrefProxyConfigTracker* CreateProxyConfigTracker();
115 116
116 // The real underlying profile. 117 // The real underlying profile.
117 Profile* profile_; 118 Profile* profile_;
118 119
119 // Weak pointer owned by |profile_|. 120 // Weak pointer owned by |profile_|.
120 PrefServiceSyncable* prefs_; 121 PrefServiceSyncable* prefs_;
121 122
122 OffTheRecordProfileIOData::Handle io_data_; 123 OffTheRecordProfileIOData::Handle io_data_;
123 124
124 // We use a non-persistent content settings map for OTR. 125 // We use a non-persistent content settings map for OTR.
125 scoped_refptr<HostContentSettingsMap> host_content_settings_map_; 126 scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
126 127
127 // Time we were started. 128 // Time we were started.
128 Time start_time_; 129 Time start_time_;
129 130
130 base::FilePath last_selected_directory_; 131 base::FilePath last_selected_directory_;
131 132
132 scoped_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_; 133 scoped_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
133 134
134 content::HostZoomMap::ZoomLevelChangedCallback zoom_callback_; 135 content::HostZoomMap::ZoomLevelChangedCallback zoom_callback_;
135 136
136 DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl); 137 DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl);
137 }; 138 };
138 139
139 #endif // CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IMPL_H_ 140 #endif // CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698