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

Side by Side Diff: content/shell/browser/shell_browser_context.h

Issue 1987643002: Make default media device ID salts random by default (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 CONTENT_SHELL_BROWSER_SHELL_BROWSER_CONTEXT_H_ 5 #ifndef CONTENT_SHELL_BROWSER_SHELL_BROWSER_CONTEXT_H_
6 #define CONTENT_SHELL_BROWSER_SHELL_BROWSER_CONTEXT_H_ 6 #define CONTENT_SHELL_BROWSER_SHELL_BROWSER_CONTEXT_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <string>
9 10
10 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
11 #include "base/files/file_path.h" 12 #include "base/files/file_path.h"
12 #include "base/macros.h" 13 #include "base/macros.h"
13 #include "base/memory/ref_counted.h" 14 #include "base/memory/ref_counted.h"
14 #include "content/public/browser/browser_context.h" 15 #include "content/public/browser/browser_context.h"
15 #include "content/public/browser/content_browser_client.h" 16 #include "content/public/browser/content_browser_client.h"
16 #include "content/public/browser/resource_context.h" 17 #include "content/public/browser/resource_context.h"
17 #include "content/shell/browser/shell_url_request_context_getter.h" 18 #include "content/shell/browser/shell_url_request_context_getter.h"
18 #include "net/url_request/url_request_job_factory.h" 19 #include "net/url_request/url_request_job_factory.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 protected: 69 protected:
69 // Contains URLRequestContextGetter required for resource loading. 70 // Contains URLRequestContextGetter required for resource loading.
70 class ShellResourceContext : public ResourceContext { 71 class ShellResourceContext : public ResourceContext {
71 public: 72 public:
72 ShellResourceContext(); 73 ShellResourceContext();
73 ~ShellResourceContext() override; 74 ~ShellResourceContext() override;
74 75
75 // ResourceContext implementation: 76 // ResourceContext implementation:
76 net::HostResolver* GetHostResolver() override; 77 net::HostResolver* GetHostResolver() override;
77 net::URLRequestContext* GetRequestContext() override; 78 net::URLRequestContext* GetRequestContext() override;
79 SaltCallback GetMediaDeviceIDSalt() override;
78 80
79 void set_url_request_context_getter(ShellURLRequestContextGetter* getter) { 81 void set_url_request_context_getter(ShellURLRequestContextGetter* getter) {
80 getter_ = getter; 82 getter_ = getter;
81 } 83 }
82 84
83 private: 85 private:
84 ShellURLRequestContextGetter* getter_; 86 ShellURLRequestContextGetter* getter_;
87 std::string media_device_id_salt_;
85 88
86 DISALLOW_COPY_AND_ASSIGN(ShellResourceContext); 89 DISALLOW_COPY_AND_ASSIGN(ShellResourceContext);
87 }; 90 };
88 91
89 ShellURLRequestContextGetter* url_request_context_getter() { 92 ShellURLRequestContextGetter* url_request_context_getter() {
90 return url_request_getter_.get(); 93 return url_request_getter_.get();
91 } 94 }
92 95
93 // Used by ShellBrowserContext to initiate and set different types of 96 // Used by ShellBrowserContext to initiate and set different types of
94 // URLRequestContextGetter. 97 // URLRequestContextGetter.
(...skipping 23 matching lines...) Expand all
118 base::FilePath path_; 121 base::FilePath path_;
119 BrowserPluginGuestManager* guest_manager_; 122 BrowserPluginGuestManager* guest_manager_;
120 scoped_refptr<ShellURLRequestContextGetter> url_request_getter_; 123 scoped_refptr<ShellURLRequestContextGetter> url_request_getter_;
121 124
122 DISALLOW_COPY_AND_ASSIGN(ShellBrowserContext); 125 DISALLOW_COPY_AND_ASSIGN(ShellBrowserContext);
123 }; 126 };
124 127
125 } // namespace content 128 } // namespace content
126 129
127 #endif // CONTENT_SHELL_BROWSER_SHELL_BROWSER_CONTEXT_H_ 130 #endif // CONTENT_SHELL_BROWSER_SHELL_BROWSER_CONTEXT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698