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

Side by Side Diff: chrome/browser/extensions/extension_proxy_api.h

Issue 6240013: Make proxy settings one atomic dictionary in the PrefStores such that modifications are atomic. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/out/Debug
Patch Set: Created 9 years, 11 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_EXTENSIONS_EXTENSION_PROXY_API_H_ 5 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_PROXY_API_H_
6 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_PROXY_API_H_ 6 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_PROXY_API_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "chrome/browser/extensions/extension_function.h" 10 #include "chrome/browser/extensions/extension_function.h"
(...skipping 24 matching lines...) Expand all
35 }; 35 };
36 ProxyServer() : scheme("http"), host(""), port(INVALID_PORT) {} 36 ProxyServer() : scheme("http"), host(""), port(INVALID_PORT) {}
37 37
38 // The scheme of the proxy URI itself. 38 // The scheme of the proxy URI itself.
39 std::string scheme; 39 std::string scheme;
40 std::string host; 40 std::string host;
41 int port; 41 int port;
42 }; 42 };
43 43
44 bool GetProxyServer(const DictionaryValue* dict, ProxyServer* proxy_server); 44 bool GetProxyServer(const DictionaryValue* dict, ProxyServer* proxy_server);
45 45 bool GetProxyRules(DictionaryValue* proxy_rules, std::string* out);
46 bool ApplyMode(const std::string& mode, bool incognito);
47 bool ApplyPacScript(DictionaryValue* pac_dict, bool incognito);
48 bool ApplyProxyRules(DictionaryValue* proxy_rules, bool incognito);
49 }; 46 };
50 47
51 class RemoveCustomProxySettingsFunction : public ProxySettingsFunction { 48 class RemoveCustomProxySettingsFunction : public ProxySettingsFunction {
52 public: 49 public:
53 virtual ~RemoveCustomProxySettingsFunction() {} 50 virtual ~RemoveCustomProxySettingsFunction() {}
54 virtual bool RunImpl(); 51 virtual bool RunImpl();
55 52
56 DECLARE_EXTENSION_FUNCTION_NAME( 53 DECLARE_EXTENSION_FUNCTION_NAME(
57 "experimental.proxy.removeCustomProxySettings") 54 "experimental.proxy.removeCustomProxySettings")
58 }; 55 };
59 56
60 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_PROXY_API_H_ 57 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_PROXY_API_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698