mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

REVIEW: Move MediaDeviceIDSalt from ProfileIOData to ProfileImpl.

Browse source 
https://codereview.chromium.org/2820163002
This commit is contained in:
Aleksei Kuzmin 2017-08-05 00:15:28 +03:00 • committed by Cheng Zhao
parent ba6e8b4dff
commit b81ae1c36f
4 changed files with 7 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

14
brightray/browser/browser_context.cc
View file

@ -10,7 +10,6 @@
#include "brightray/browser/brightray_paths.h"
#include "brightray/browser/browser_client.h"
#include "brightray/browser/inspectable_web_contents_impl.h"
#include "brightray/browser/media/media_device_id_salt.h"
#include "brightray/browser/network_delegate.h"
#include "brightray/browser/special_storage_policy.h"
#include "brightray/browser/zoom_level_delegate.h"
@ -54,13 +53,6 @@ class BrowserContext::ResourceContext : public content::ResourceContext {
return getter_->GetURLRequestContext();
}
std::string GetMediaDeviceIDSalt() override {
auto media_device_id_salt_ = getter_->GetMediaDeviceIDSalt();
if (media_device_id_salt_)
return media_device_id_salt_->GetSalt();
return content::ResourceContext::GetMediaDeviceIDSalt();
}
URLRequestContextGetter* getter_;
};
@ -153,12 +145,10 @@ net::NetworkDelegate* BrowserContext::CreateNetworkDelegate() {
return new NetworkDelegate;
}
MediaDeviceIDSalt* BrowserContext::GetMediaDeviceIDSalt() {
if (IsOffTheRecord())
return nullptr;
std::string BrowserContext::GetMediaDeviceIDSalt() {
if (!media_device_id_salt_.get())
media_device_id_salt_.reset(new MediaDeviceIDSalt(prefs_.get()));
return media_device_id_salt_.get();
return media_device_id_salt_->GetSalt();
}
base::FilePath BrowserContext::GetPath() const {