| OLD | NEW | 
|    1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |    1 // Copyright (c) 2012 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_CONFIG_SERVICE_IMPL_H_ |    5 #ifndef CHROME_BROWSER_CHROMEOS_PROXY_CONFIG_SERVICE_IMPL_H_ | 
|    6 #define CHROME_BROWSER_CHROMEOS_PROXY_CONFIG_SERVICE_IMPL_H_ |    6 #define CHROME_BROWSER_CHROMEOS_PROXY_CONFIG_SERVICE_IMPL_H_ | 
|    7  |    7  | 
|    8 #include <string> |    8 #include <string> | 
|    9 #include <vector> |    9 #include <vector> | 
|   10  |   10  | 
|   11 #include "base/basictypes.h" |   11 #include "base/basictypes.h" | 
|   12 #include "base/values.h" |   12 #include "base/values.h" | 
 |   13 #include "chrome/browser/api/prefs/pref_member.h" | 
|   13 #include "chrome/browser/chromeos/cros/network_library.h" |   14 #include "chrome/browser/chromeos/cros/network_library.h" | 
|   14 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h" |   15 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h" | 
|   15 #include "chrome/browser/prefs/pref_member.h" |  | 
|   16  |   16  | 
|   17 namespace chromeos { |   17 namespace chromeos { | 
|   18  |   18  | 
|   19 // Implementation of proxy config service for chromeos that: |   19 // Implementation of proxy config service for chromeos that: | 
|   20 // - extends PrefProxyConfigTrackerImpl (and so lives and runs entirely on UI |   20 // - extends PrefProxyConfigTrackerImpl (and so lives and runs entirely on UI | 
|   21 //   thread) to handle proxy from prefs (via PrefProxyConfigTrackerImpl) and |   21 //   thread) to handle proxy from prefs (via PrefProxyConfigTrackerImpl) and | 
|   22 //   system i.e. network (via flimflam notifications) |   22 //   system i.e. network (via flimflam notifications) | 
|   23 // - exists one per profile and one per local state |   23 // - exists one per profile and one per local state | 
|   24 // - retrieves initial system proxy configuration from cros settings persisted |   24 // - retrieves initial system proxy configuration from cros settings persisted | 
|   25 //   on chromeos device from chromeos revisions before migration to flimflam, |   25 //   on chromeos device from chromeos revisions before migration to flimflam, | 
| (...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  291   std::vector<base::Closure> callbacks_; |  291   std::vector<base::Closure> callbacks_; | 
|  292  |  292  | 
|  293   base::WeakPtrFactory<ProxyConfigServiceImpl> pointer_factory_; |  293   base::WeakPtrFactory<ProxyConfigServiceImpl> pointer_factory_; | 
|  294  |  294  | 
|  295   DISALLOW_COPY_AND_ASSIGN(ProxyConfigServiceImpl); |  295   DISALLOW_COPY_AND_ASSIGN(ProxyConfigServiceImpl); | 
|  296 }; |  296 }; | 
|  297  |  297  | 
|  298 }  // namespace chromeos |  298 }  // namespace chromeos | 
|  299  |  299  | 
|  300 #endif  // CHROME_BROWSER_CHROMEOS_PROXY_CONFIG_SERVICE_IMPL_H_ |  300 #endif  // CHROME_BROWSER_CHROMEOS_PROXY_CONFIG_SERVICE_IMPL_H_ | 
| OLD | NEW |