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

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

Issue 54863002: Implement a salt for MediaSource IDs that can be cleared by a user. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Moved media_devices_monitor to content/browser/media Created 7 years, 1 month 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
« no previous file with comments | « chrome/browser/prefs/browser_prefs.cc ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_PROFILE_IO_DATA_H_ 5 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
6 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 6 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 15 matching lines...) Expand all
26 #include "net/http/http_network_session.h" 26 #include "net/http/http_network_session.h"
27 #include "net/url_request/url_request_job_factory.h" 27 #include "net/url_request/url_request_job_factory.h"
28 28
29 class ChromeHttpUserAgentSettings; 29 class ChromeHttpUserAgentSettings;
30 class ChromeNetworkDelegate; 30 class ChromeNetworkDelegate;
31 class CookieSettings; 31 class CookieSettings;
32 class DesktopNotificationService; 32 class DesktopNotificationService;
33 class ExtensionInfoMap; 33 class ExtensionInfoMap;
34 class HostContentSettingsMap; 34 class HostContentSettingsMap;
35 class ManagedModeURLFilter; 35 class ManagedModeURLFilter;
36 class MediaDeviceIDSalt;
36 class Profile; 37 class Profile;
37 class ProtocolHandlerRegistry; 38 class ProtocolHandlerRegistry;
38 class SigninNamesOnIOThread; 39 class SigninNamesOnIOThread;
39 class TransportSecurityPersister; 40 class TransportSecurityPersister;
40 41
41 namespace chrome_browser_net { 42 namespace chrome_browser_net {
42 class LoadTimeStats; 43 class LoadTimeStats;
43 class ResourcePrefetchPredictorObserver; 44 class ResourcePrefetchPredictorObserver;
44 } 45 }
45 46
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 } 167 }
167 168
168 BooleanPrefMember* sync_disabled() const { 169 BooleanPrefMember* sync_disabled() const {
169 return &sync_disabled_; 170 return &sync_disabled_;
170 } 171 }
171 172
172 BooleanPrefMember* signin_allowed() const { 173 BooleanPrefMember* signin_allowed() const {
173 return &signin_allowed_; 174 return &signin_allowed_;
174 } 175 }
175 176
177 std::string GetMediaDeviceIDSalt() const;
178
176 net::TransportSecurityState* transport_security_state() const { 179 net::TransportSecurityState* transport_security_state() const {
177 return transport_security_state_.get(); 180 return transport_security_state_.get();
178 } 181 }
179 182
180 bool is_incognito() const { 183 bool is_incognito() const {
181 return is_incognito_; 184 return is_incognito_;
182 } 185 }
183 186
184 chrome_browser_net::ResourcePrefetchPredictorObserver* 187 chrome_browser_net::ResourcePrefetchPredictorObserver*
185 resource_prefetch_predictor_observer() const { 188 resource_prefetch_predictor_observer() const {
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
523 mutable scoped_refptr<HostContentSettingsMap> host_content_settings_map_; 526 mutable scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
524 527
525 mutable scoped_ptr<chrome_browser_net::ResourcePrefetchPredictorObserver> 528 mutable scoped_ptr<chrome_browser_net::ResourcePrefetchPredictorObserver>
526 resource_prefetch_predictor_observer_; 529 resource_prefetch_predictor_observer_;
527 530
528 mutable scoped_ptr<ChromeHttpUserAgentSettings> 531 mutable scoped_ptr<ChromeHttpUserAgentSettings>
529 chrome_http_user_agent_settings_; 532 chrome_http_user_agent_settings_;
530 533
531 mutable chrome_browser_net::LoadTimeStats* load_time_stats_; 534 mutable chrome_browser_net::LoadTimeStats* load_time_stats_;
532 535
536 mutable scoped_ptr<MediaDeviceIDSalt> media_device_id_salt_;
willchan no longer on Chromium 2013/11/02 20:46:55 Move this earlier. See the comments at line 437. M
perkj_chrome 2013/11/04 11:52:51 Done.
537
533 #if defined(ENABLE_MANAGED_USERS) 538 #if defined(ENABLE_MANAGED_USERS)
534 mutable scoped_refptr<const ManagedModeURLFilter> managed_mode_url_filter_; 539 mutable scoped_refptr<const ManagedModeURLFilter> managed_mode_url_filter_;
535 #endif 540 #endif
536 541
537 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. 542 // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
538 bool initialized_on_UI_thread_; 543 bool initialized_on_UI_thread_;
539 544
540 bool is_incognito_; 545 bool is_incognito_;
541 546
542 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); 547 DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
543 }; 548 };
544 549
545 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 550 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
OLDNEW
« no previous file with comments | « chrome/browser/prefs/browser_prefs.cc ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698