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

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: Updated to ToT and addressed Matt's comments in base-CL Created 9 years, 10 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 25 matching lines...) Expand all
36 }; 36 };
37 ProxyServer() : scheme("http"), host(""), port(INVALID_PORT) {} 37 ProxyServer() : scheme("http"), host(""), port(INVALID_PORT) {}
38 38
39 // The scheme of the proxy URI itself. 39 // The scheme of the proxy URI itself.
40 std::string scheme; 40 std::string scheme;
41 std::string host; 41 std::string host;
42 int port; 42 int port;
43 }; 43 };
44 44
45 bool GetProxyServer(const DictionaryValue* dict, ProxyServer* proxy_server); 45 bool GetProxyServer(const DictionaryValue* dict, ProxyServer* proxy_server);
46 46 bool GetProxyRules(DictionaryValue* proxy_rules, std::string* out);
danno 2011/02/04 10:32:13 Ad bit of documentation would actually help here.
battre 2011/02/07 14:13:47 Done.
47 bool ApplyMode(const std::string& mode, bool incognito);
48 bool ApplyPacScript(DictionaryValue* pac_dict, bool incognito);
49 bool ApplyProxyRules(DictionaryValue* proxy_rules, bool incognito);
50 }; 47 };
51 48
52 class RemoveCustomProxySettingsFunction : public ProxySettingsFunction { 49 class RemoveCustomProxySettingsFunction : public ProxySettingsFunction {
53 public: 50 public:
54 virtual ~RemoveCustomProxySettingsFunction() {} 51 virtual ~RemoveCustomProxySettingsFunction() {}
55 virtual bool RunImpl(); 52 virtual bool RunImpl();
56 53
57 DECLARE_EXTENSION_FUNCTION_NAME( 54 DECLARE_EXTENSION_FUNCTION_NAME(
58 "experimental.proxy.removeCustomProxySettings") 55 "experimental.proxy.removeCustomProxySettings")
59 }; 56 };
60 57
61 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_PROXY_API_H_ 58 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_PROXY_API_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698