projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update To 11.40.268.0
[platform/framework/web/crosswalk.git]
/
src
/
chrome
/
browser
/
net
/
spdyproxy
/
data_reduction_proxy_chrome_settings.h
diff --git
a/src/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h
b/src/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h
index
57cf435
..
9c33879
100644
(file)
--- a/
src/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h
+++ b/
src/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h
@@
-6,7
+6,8
@@
#define CHROME_BROWSER_NET_SPDYPROXY_DATA_REDUCTION_PROXY_CHROME_SETTINGS_H_
#include "base/memory/scoped_ptr.h"
#define CHROME_BROWSER_NET_SPDYPROXY_DATA_REDUCTION_PROXY_CHROME_SETTINGS_H_
#include "base/memory/scoped_ptr.h"
-#include "components/data_reduction_proxy/browser/data_reduction_proxy_settings.h"
+#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_auth_request_handler.h"
+#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.h"
#include "components/keyed_service/core/keyed_service.h"
namespace base {
#include "components/keyed_service/core/keyed_service.h"
namespace base {
@@
-36,7
+37,7
@@
class DataReductionProxyChromeSettings
data_reduction_proxy::DataReductionProxyParams* params);
// Destructs the settings object.
data_reduction_proxy::DataReductionProxyParams* params);
// Destructs the settings object.
-
virtual ~DataReductionProxyChromeSettings()
;
+
~DataReductionProxyChromeSettings() override
;
// Initialize the settings object with the given configurator, prefs services,
// and request context.
// Initialize the settings object with the given configurator, prefs services,
// and request context.
@@
-47,7
+48,7
@@
class DataReductionProxyChromeSettings
net::URLRequestContextGetter* request_context);
// Gets the client type for the data reduction proxy.
net::URLRequestContextGetter* request_context);
// Gets the client type for the data reduction proxy.
- static
std::string
GetClient();
+ static
data_reduction_proxy::Client
GetClient();
private:
// Registers the DataReductionProxyEnabled synthetic field trial with
private:
// Registers the DataReductionProxyEnabled synthetic field trial with