OLD | NEW |
---|---|
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 #include "net/proxy/proxy_config_service_linux.h" | 5 #include "net/proxy/proxy_config_service_linux.h" |
6 | 6 |
7 #include <errno.h> | 7 #include <errno.h> |
8 #include <fcntl.h> | 8 #include <fcntl.h> |
9 #if defined(USE_GCONF) | 9 #if defined(USE_GCONF) |
10 #include <gconf/gconf-client.h> | 10 #include <gconf/gconf-client.h> |
(...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
548 DCHECK(!client_); | 548 DCHECK(!client_); |
549 #if defined(DLOPEN_GSETTINGS) | 549 #if defined(DLOPEN_GSETTINGS) |
550 if (gio_handle_) { | 550 if (gio_handle_) { |
551 dlclose(gio_handle_); | 551 dlclose(gio_handle_); |
552 gio_handle_ = NULL; | 552 gio_handle_ = NULL; |
553 } | 553 } |
554 #endif | 554 #endif |
555 } | 555 } |
556 | 556 |
557 bool SchemaExists(const char* schema_name) { | 557 bool SchemaExists(const char* schema_name) { |
558 const gchar* const* schemas = g_settings_list_schemas(); | 558 const gchar* const* schemas = g_settings_list_schemas(); |
vandebo (ex-Chrome)
2011/08/16 20:59:10
I can see how this came about, since the double st
| |
559 while (*schemas) { | 559 while (*schemas) { |
560 if (strcmp(schema_name, reinterpret_cast<const char*>(schemas)) == 0) | 560 if (strcmp(schema_name, static_cast<const char*>(*schemas)) == 0) |
561 return true; | 561 return true; |
562 schemas++; | 562 schemas++; |
563 } | 563 } |
564 return false; | 564 return false; |
565 } | 565 } |
566 | 566 |
567 // LoadAndCheckVersion() must be called *before* Init()! | 567 // LoadAndCheckVersion() must be called *before* Init()! |
568 bool LoadAndCheckVersion(base::Environment* env); | 568 bool LoadAndCheckVersion(base::Environment* env); |
569 | 569 |
570 virtual bool Init(MessageLoop* glib_default_loop, | 570 virtual bool Init(MessageLoop* glib_default_loop, |
(...skipping 1216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1787 void ProxyConfigServiceLinux::RemoveObserver(Observer* observer) { | 1787 void ProxyConfigServiceLinux::RemoveObserver(Observer* observer) { |
1788 delegate_->RemoveObserver(observer); | 1788 delegate_->RemoveObserver(observer); |
1789 } | 1789 } |
1790 | 1790 |
1791 ProxyConfigService::ConfigAvailability | 1791 ProxyConfigService::ConfigAvailability |
1792 ProxyConfigServiceLinux::GetLatestProxyConfig(ProxyConfig* config) { | 1792 ProxyConfigServiceLinux::GetLatestProxyConfig(ProxyConfig* config) { |
1793 return delegate_->GetLatestProxyConfig(config); | 1793 return delegate_->GetLatestProxyConfig(config); |
1794 } | 1794 } |
1795 | 1795 |
1796 } // namespace net | 1796 } // namespace net |
OLD | NEW |