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

Side by Side Diff: net/proxy/proxy_config_service_linux.cc

Issue 174106: Linux: make the "change proxy settings" button able to start several proxy config utilities. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 4 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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 <gconf/gconf-client.h> 7 #include <gconf/gconf-client.h>
8 #include <stdlib.h> 8 #include <stdlib.h>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after
547 // Keep a copy of the config for use from this thread for 547 // Keep a copy of the config for use from this thread for
548 // comparison with updated settings when we get notifications. 548 // comparison with updated settings when we get notifications.
549 reference_config_ = cached_config_; 549 reference_config_ = cached_config_;
550 reference_config_.set_id(1); // mark it as valid 550 reference_config_.set_id(1); // mark it as valid
551 } else { 551 } else {
552 gconf_getter_->Release(); // Stop notifications 552 gconf_getter_->Release(); // Stop notifications
553 } 553 }
554 } 554 }
555 break; 555 break;
556 556
557 case base::DESKTOP_ENVIRONMENT_KDE: 557 case base::DESKTOP_ENVIRONMENT_KDE3:
558 case base::DESKTOP_ENVIRONMENT_KDE4:
558 NOTIMPLEMENTED() << "Bug 17363: obey KDE proxy settings."; 559 NOTIMPLEMENTED() << "Bug 17363: obey KDE proxy settings.";
559 break; 560 break;
560 561
561 case base::DESKTOP_ENVIRONMENT_OTHER: 562 case base::DESKTOP_ENVIRONMENT_OTHER:
562 break; 563 break;
563 } 564 }
564 565
565 if (!got_config) { 566 if (!got_config) {
566 // We fall back on environment variables. 567 // We fall back on environment variables.
567 // 568 //
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
650 new GConfSettingGetterImpl())) { 651 new GConfSettingGetterImpl())) {
651 } 652 }
652 653
653 ProxyConfigServiceLinux::ProxyConfigServiceLinux( 654 ProxyConfigServiceLinux::ProxyConfigServiceLinux(
654 base::EnvironmentVariableGetter* env_var_getter, 655 base::EnvironmentVariableGetter* env_var_getter,
655 GConfSettingGetter* gconf_getter) 656 GConfSettingGetter* gconf_getter)
656 : delegate_(new Delegate(env_var_getter, gconf_getter)) { 657 : delegate_(new Delegate(env_var_getter, gconf_getter)) {
657 } 658 }
658 659
659 } // namespace net 660 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698