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

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

Issue 1562593002: Fix potential crashes in NetworkHandler code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@test
Patch Set: IsShuttingDown -> OnShuttingDown Created 4 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
OLDNEW
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 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 explicit ProxyConfigServiceImpl(PrefService* profile_prefs, 45 explicit ProxyConfigServiceImpl(PrefService* profile_prefs,
46 PrefService* local_state_prefs); 46 PrefService* local_state_prefs);
47 ~ProxyConfigServiceImpl() override; 47 ~ProxyConfigServiceImpl() override;
48 48
49 // PrefProxyConfigTrackerImpl implementation. 49 // PrefProxyConfigTrackerImpl implementation.
50 void OnProxyConfigChanged(ProxyPrefs::ConfigState config_state, 50 void OnProxyConfigChanged(ProxyPrefs::ConfigState config_state,
51 const net::ProxyConfig& config) override; 51 const net::ProxyConfig& config) override;
52 52
53 // NetworkStateHandlerObserver implementation. 53 // NetworkStateHandlerObserver implementation.
54 void DefaultNetworkChanged(const NetworkState* network) override; 54 void DefaultNetworkChanged(const NetworkState* network) override;
55 void OnShuttingDown() override;
55 56
56 protected: 57 protected:
57 friend class UIProxyConfigService; 58 friend class UIProxyConfigService;
58 59
59 // Returns true if proxy is to be ignored for this network profile and 60 // Returns true if proxy is to be ignored for this network profile and
60 // |onc_source|, e.g. this happens if the network is shared and 61 // |onc_source|, e.g. this happens if the network is shared and
61 // use-shared-proxies is turned off. |profile_prefs| may be NULL. 62 // use-shared-proxies is turned off. |profile_prefs| may be NULL.
62 static bool IgnoreProxy(const PrefService* profile_prefs, 63 static bool IgnoreProxy(const PrefService* profile_prefs,
63 const std::string network_profile_path, 64 const std::string network_profile_path,
64 onc::ONCSource onc_source); 65 onc::ONCSource onc_source);
(...skipping 30 matching lines...) Expand all
95 PrefService* local_state_prefs_; 96 PrefService* local_state_prefs_;
96 97
97 base::WeakPtrFactory<ProxyConfigServiceImpl> pointer_factory_; 98 base::WeakPtrFactory<ProxyConfigServiceImpl> pointer_factory_;
98 99
99 DISALLOW_COPY_AND_ASSIGN(ProxyConfigServiceImpl); 100 DISALLOW_COPY_AND_ASSIGN(ProxyConfigServiceImpl);
100 }; 101 };
101 102
102 } // namespace chromeos 103 } // namespace chromeos
103 104
104 #endif // CHROME_BROWSER_CHROMEOS_PROXY_CONFIG_SERVICE_IMPL_H_ 105 #endif // CHROME_BROWSER_CHROMEOS_PROXY_CONFIG_SERVICE_IMPL_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/mobile/mobile_activator_unittest.cc ('k') | chrome/browser/chromeos/proxy_config_service_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698