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

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: Addressed jois nit. Created 7 years 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 13 matching lines...) Expand all
24 #include "content/public/browser/resource_context.h" 24 #include "content/public/browser/resource_context.h"
25 #include "net/cookies/cookie_monster.h" 25 #include "net/cookies/cookie_monster.h"
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 HostContentSettingsMap; 32 class HostContentSettingsMap;
33 class ManagedModeURLFilter; 33 class ManagedModeURLFilter;
34 class MediaDeviceIDSalt;
34 class Profile; 35 class Profile;
35 class ProtocolHandlerRegistry; 36 class ProtocolHandlerRegistry;
36 class SigninNamesOnIOThread; 37 class SigninNamesOnIOThread;
37 38
38 namespace chrome_browser_net { 39 namespace chrome_browser_net {
39 class LoadTimeStats; 40 class LoadTimeStats;
40 class ResourcePrefetchPredictorObserver; 41 class ResourcePrefetchPredictorObserver;
41 } 42 }
42 43
43 namespace extensions { 44 namespace extensions {
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 } 164 }
164 165
165 BooleanPrefMember* sync_disabled() const { 166 BooleanPrefMember* sync_disabled() const {
166 return &sync_disabled_; 167 return &sync_disabled_;
167 } 168 }
168 169
169 BooleanPrefMember* signin_allowed() const { 170 BooleanPrefMember* signin_allowed() const {
170 return &signin_allowed_; 171 return &signin_allowed_;
171 } 172 }
172 173
174 std::string GetMediaDeviceIDSalt() const;
175
173 net::TransportSecurityState* transport_security_state() const { 176 net::TransportSecurityState* transport_security_state() const {
174 return transport_security_state_.get(); 177 return transport_security_state_.get();
175 } 178 }
176 179
177 bool is_incognito() const { 180 bool is_incognito() const {
178 return is_incognito_; 181 return is_incognito_;
179 } 182 }
180 183
181 chrome_browser_net::ResourcePrefetchPredictorObserver* 184 chrome_browser_net::ResourcePrefetchPredictorObserver*
182 resource_prefetch_predictor_observer() const { 185 resource_prefetch_predictor_observer() const {
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 public: 349 public:
347 explicit ResourceContext(ProfileIOData* io_data); 350 explicit ResourceContext(ProfileIOData* io_data);
348 virtual ~ResourceContext(); 351 virtual ~ResourceContext();
349 352
350 // ResourceContext implementation: 353 // ResourceContext implementation:
351 virtual net::HostResolver* GetHostResolver() OVERRIDE; 354 virtual net::HostResolver* GetHostResolver() OVERRIDE;
352 virtual net::URLRequestContext* GetRequestContext() OVERRIDE; 355 virtual net::URLRequestContext* GetRequestContext() OVERRIDE;
353 virtual scoped_ptr<net::ClientCertStore> CreateClientCertStore() OVERRIDE; 356 virtual scoped_ptr<net::ClientCertStore> CreateClientCertStore() OVERRIDE;
354 virtual bool AllowMicAccess(const GURL& origin) OVERRIDE; 357 virtual bool AllowMicAccess(const GURL& origin) OVERRIDE;
355 virtual bool AllowCameraAccess(const GURL& origin) OVERRIDE; 358 virtual bool AllowCameraAccess(const GURL& origin) OVERRIDE;
359 virtual std::string GetMediaDeviceIDSalt() OVERRIDE;
356 360
357 private: 361 private:
358 friend class ProfileIOData; 362 friend class ProfileIOData;
359 363
360 // Helper method that returns true if |type| is allowed for |origin|, false 364 // Helper method that returns true if |type| is allowed for |origin|, false
361 // otherwise. 365 // otherwise.
362 bool AllowContentAccess(const GURL& origin, ContentSettingsType type); 366 bool AllowContentAccess(const GURL& origin, ContentSettingsType type);
363 367
364 ProfileIOData* const io_data_; 368 ProfileIOData* const io_data_;
365 369
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
446 mutable StringPrefMember google_services_username_; 450 mutable StringPrefMember google_services_username_;
447 mutable StringPrefMember google_services_username_pattern_; 451 mutable StringPrefMember google_services_username_pattern_;
448 mutable BooleanPrefMember reverse_autologin_enabled_; 452 mutable BooleanPrefMember reverse_autologin_enabled_;
449 453
450 // During the reverse autologin request chain processing, this member saves 454 // During the reverse autologin request chain processing, this member saves
451 // the email of the google account that is being signed into. 455 // the email of the google account that is being signed into.
452 std::string reverse_autologin_pending_email_; 456 std::string reverse_autologin_pending_email_;
453 457
454 mutable StringListPrefMember one_click_signin_rejected_email_list_; 458 mutable StringListPrefMember one_click_signin_rejected_email_list_;
455 459
460 mutable scoped_ptr<MediaDeviceIDSalt> media_device_id_salt_;
461
456 // Member variables which are pointed to by the various context objects. 462 // Member variables which are pointed to by the various context objects.
457 mutable BooleanPrefMember enable_referrers_; 463 mutable BooleanPrefMember enable_referrers_;
458 mutable BooleanPrefMember enable_do_not_track_; 464 mutable BooleanPrefMember enable_do_not_track_;
459 mutable BooleanPrefMember force_safesearch_; 465 mutable BooleanPrefMember force_safesearch_;
460 mutable BooleanPrefMember safe_browsing_enabled_; 466 mutable BooleanPrefMember safe_browsing_enabled_;
461 mutable BooleanPrefMember printing_enabled_; 467 mutable BooleanPrefMember printing_enabled_;
462 mutable BooleanPrefMember sync_disabled_; 468 mutable BooleanPrefMember sync_disabled_;
463 mutable BooleanPrefMember signin_allowed_; 469 mutable BooleanPrefMember signin_allowed_;
464 // TODO(marja): Remove session_startup_pref_ if no longer needed. 470 // TODO(marja): Remove session_startup_pref_ if no longer needed.
465 mutable IntegerPrefMember session_startup_pref_; 471 mutable IntegerPrefMember session_startup_pref_;
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
521 527
522 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. 528 // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
523 bool initialized_on_UI_thread_; 529 bool initialized_on_UI_thread_;
524 530
525 bool is_incognito_; 531 bool is_incognito_;
526 532
527 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); 533 DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
528 }; 534 };
529 535
530 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 536 #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