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

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 GetMediaDeviceIDSalt to ResourceContext. 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
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 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 public: 360 public:
358 explicit ResourceContext(ProfileIOData* io_data); 361 explicit ResourceContext(ProfileIOData* io_data);
359 virtual ~ResourceContext(); 362 virtual ~ResourceContext();
360 363
361 // ResourceContext implementation: 364 // ResourceContext implementation:
362 virtual net::HostResolver* GetHostResolver() OVERRIDE; 365 virtual net::HostResolver* GetHostResolver() OVERRIDE;
363 virtual net::URLRequestContext* GetRequestContext() OVERRIDE; 366 virtual net::URLRequestContext* GetRequestContext() OVERRIDE;
364 virtual scoped_ptr<net::ClientCertStore> CreateClientCertStore() OVERRIDE; 367 virtual scoped_ptr<net::ClientCertStore> CreateClientCertStore() OVERRIDE;
365 virtual bool AllowMicAccess(const GURL& origin) OVERRIDE; 368 virtual bool AllowMicAccess(const GURL& origin) OVERRIDE;
366 virtual bool AllowCameraAccess(const GURL& origin) OVERRIDE; 369 virtual bool AllowCameraAccess(const GURL& origin) OVERRIDE;
370 virtual std::string GetMediaDeviceIDSalt() OVERRIDE;
367 371
368 private: 372 private:
369 friend class ProfileIOData; 373 friend class ProfileIOData;
370 374
371 // Helper method that returns true if |type| is allowed for |origin|, false 375 // Helper method that returns true if |type| is allowed for |origin|, false
372 // otherwise. 376 // otherwise.
373 bool AllowContentAccess(const GURL& origin, ContentSettingsType type); 377 bool AllowContentAccess(const GURL& origin, ContentSettingsType type);
374 378
375 ProfileIOData* const io_data_; 379 ProfileIOData* const io_data_;
376 380
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
457 mutable StringPrefMember google_services_username_; 461 mutable StringPrefMember google_services_username_;
458 mutable StringPrefMember google_services_username_pattern_; 462 mutable StringPrefMember google_services_username_pattern_;
459 mutable BooleanPrefMember reverse_autologin_enabled_; 463 mutable BooleanPrefMember reverse_autologin_enabled_;
460 464
461 // During the reverse autologin request chain processing, this member saves 465 // During the reverse autologin request chain processing, this member saves
462 // the email of the google account that is being signed into. 466 // the email of the google account that is being signed into.
463 std::string reverse_autologin_pending_email_; 467 std::string reverse_autologin_pending_email_;
464 468
465 mutable StringListPrefMember one_click_signin_rejected_email_list_; 469 mutable StringListPrefMember one_click_signin_rejected_email_list_;
466 470
471 mutable scoped_ptr<MediaDeviceIDSalt> media_device_id_salt_;
472
467 // Member variables which are pointed to by the various context objects. 473 // Member variables which are pointed to by the various context objects.
468 mutable BooleanPrefMember enable_referrers_; 474 mutable BooleanPrefMember enable_referrers_;
469 mutable BooleanPrefMember enable_do_not_track_; 475 mutable BooleanPrefMember enable_do_not_track_;
470 mutable BooleanPrefMember force_safesearch_; 476 mutable BooleanPrefMember force_safesearch_;
471 mutable BooleanPrefMember safe_browsing_enabled_; 477 mutable BooleanPrefMember safe_browsing_enabled_;
472 mutable BooleanPrefMember printing_enabled_; 478 mutable BooleanPrefMember printing_enabled_;
473 mutable BooleanPrefMember sync_disabled_; 479 mutable BooleanPrefMember sync_disabled_;
474 mutable BooleanPrefMember signin_allowed_; 480 mutable BooleanPrefMember signin_allowed_;
475 // TODO(marja): Remove session_startup_pref_ if no longer needed. 481 // TODO(marja): Remove session_startup_pref_ if no longer needed.
476 mutable IntegerPrefMember session_startup_pref_; 482 mutable IntegerPrefMember session_startup_pref_;
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
536 542
537 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. 543 // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
538 bool initialized_on_UI_thread_; 544 bool initialized_on_UI_thread_;
539 545
540 bool is_incognito_; 546 bool is_incognito_;
541 547
542 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); 548 DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
543 }; 549 };
544 550
545 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 551 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698