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

Side by Side Diff: chrome/browser/chromeos/proxy_cros_settings_provider.h

Issue 8496017: cros proxy: fix bug to use default port whenever its input field is empty. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 1 month 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/proxy_cros_settings_provider.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_CHROMEOS_PROXY_CROS_SETTINGS_PROVIDER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_PROXY_CROS_SETTINGS_PROVIDER_H_
6 #define CHROME_BROWSER_CHROMEOS_PROXY_CROS_SETTINGS_PROVIDER_H_ 6 #define CHROME_BROWSER_CHROMEOS_PROXY_CROS_SETTINGS_PROVIDER_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/memory/singleton.h" 9 #include "base/memory/singleton.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 28 matching lines...) Expand all
39 net::ProxyServer CreateProxyServerFromHost( 39 net::ProxyServer CreateProxyServerFromHost(
40 const std::string& host, 40 const std::string& host,
41 const ProxyConfigServiceImpl::ProxyConfig::ManualProxy& proxy, 41 const ProxyConfigServiceImpl::ProxyConfig::ManualProxy& proxy,
42 net::ProxyServer::Scheme scheme) const; 42 net::ProxyServer::Scheme scheme) const;
43 43
44 net::ProxyServer CreateProxyServerFromPort( 44 net::ProxyServer CreateProxyServerFromPort(
45 uint16 port, 45 uint16 port,
46 const ProxyConfigServiceImpl::ProxyConfig::ManualProxy& proxy, 46 const ProxyConfigServiceImpl::ProxyConfig::ManualProxy& proxy,
47 net::ProxyServer::Scheme scheme) const; 47 net::ProxyServer::Scheme scheme) const;
48 48
49 net::ProxyServer CreateProxyServer(
50 std::string host,
51 uint16 port,
52 net::ProxyServer::Scheme scheme) const;
53
49 Value* CreateServerHostValue( 54 Value* CreateServerHostValue(
50 const ProxyConfigServiceImpl::ProxyConfig::ManualProxy& proxy) const; 55 const ProxyConfigServiceImpl::ProxyConfig::ManualProxy& proxy) const;
51 56
52 Value* CreateServerPortValue( 57 Value* CreateServerPortValue(
53 const ProxyConfigServiceImpl::ProxyConfig::ManualProxy& proxy) const; 58 const ProxyConfigServiceImpl::ProxyConfig::ManualProxy& proxy) const;
54 59
55 Profile* profile_; // Weak ptr. 60 Profile* profile_; // Weak ptr.
56 61
57 DISALLOW_COPY_AND_ASSIGN(ProxyCrosSettingsProvider); 62 DISALLOW_COPY_AND_ASSIGN(ProxyCrosSettingsProvider);
58 }; 63 };
59 64
60 } // namespace chromeos 65 } // namespace chromeos
61 66
62 #endif // CHROME_BROWSER_CHROMEOS_PROXY_CROS_SETTINGS_PROVIDER_H_ 67 #endif // CHROME_BROWSER_CHROMEOS_PROXY_CROS_SETTINGS_PROVIDER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/proxy_cros_settings_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698