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

Unified Diff: net/proxy/proxy_config_service_android.h

Issue 992733002: Remove //net (except for Android test stuff) and sdch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/proxy/proxy_config_service.h ('k') | net/proxy/proxy_config_service_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_config_service_android.h
diff --git a/net/proxy/proxy_config_service_android.h b/net/proxy/proxy_config_service_android.h
deleted file mode 100644
index 64e6b4939b6dced9a6d660763c4d440e74fb95a7..0000000000000000000000000000000000000000
--- a/net/proxy/proxy_config_service_android.h
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef NET_PROXY_PROXY_CONFIG_SERVICE_ANDROID_H_
-#define NET_PROXY_PROXY_CONFIG_SERVICE_ANDROID_H_
-
-#include <string>
-
-#include "base/android/jni_android.h"
-#include "base/basictypes.h"
-#include "base/callback_forward.h"
-#include "base/compiler_specific.h"
-#include "base/memory/ref_counted.h"
-#include "net/base/net_export.h"
-#include "net/proxy/proxy_config_service.h"
-
-namespace base {
-class SequencedTaskRunner;
-}
-
-namespace net {
-
-class ProxyConfig;
-
-class NET_EXPORT ProxyConfigServiceAndroid : public ProxyConfigService {
- public:
- // Callback that returns the value of the property identified by the provided
- // key. If it was not found, an empty string is returned. Note that this
- // interface does not let you distinguish an empty property from a
- // non-existing property. This callback is invoked on the JNI thread.
- typedef base::Callback<std::string (const std::string& property)>
- GetPropertyCallback;
-
- // Separate class whose instance is owned by the Delegate class implemented in
- // the .cc file.
- class JNIDelegate {
- public:
- virtual ~JNIDelegate() {}
-
- // Called from Java (on JNI thread) to signal that the proxy settings have
- // changed. The string and int arguments (the host/port pair for the proxy)
- // are either a host/port pair or ("", 0) to indicate "no proxy".
- // The third argument indicates the PAC url.
- // The fourth argument is the proxy exclusion list.
- virtual void ProxySettingsChangedTo(JNIEnv*,
- jobject,
- jstring,
- jint,
- jstring,
- jobjectArray) = 0;
-
- // Called from Java (on JNI thread) to signal that the proxy settings have
- // changed. New proxy settings are fetched from the system property store.
- virtual void ProxySettingsChanged(JNIEnv*, jobject) = 0;
- };
-
- ProxyConfigServiceAndroid(
- const scoped_refptr<base::SequencedTaskRunner>& network_task_runner,
- const scoped_refptr<base::SequencedTaskRunner>& jni_task_runner);
-
- ~ProxyConfigServiceAndroid() override;
-
- // Register JNI bindings.
- static bool Register(JNIEnv* env);
-
- // Android provides a local HTTP proxy that does PAC resolution. When this
- // setting is enabled, the proxy config service ignores the PAC URL and uses
- // the local proxy for all proxy resolution.
- void set_exclude_pac_url(bool enabled);
-
- // ProxyConfigService:
- // Called only on the network thread.
- void AddObserver(Observer* observer) override;
- void RemoveObserver(Observer* observer) override;
- ConfigAvailability GetLatestProxyConfig(ProxyConfig* config) override;
-
- private:
- friend class ProxyConfigServiceAndroidTestBase;
- class Delegate;
-
- // For tests.
- ProxyConfigServiceAndroid(
- const scoped_refptr<base::SequencedTaskRunner>& network_task_runner,
- const scoped_refptr<base::SequencedTaskRunner>& jni_task_runner,
- GetPropertyCallback get_property_callback);
-
- // For tests.
- void ProxySettingsChanged();
-
- scoped_refptr<Delegate> delegate_;
-
- DISALLOW_COPY_AND_ASSIGN(ProxyConfigServiceAndroid);
-};
-
-} // namespace net
-
-#endif // NET_PROXY_PROXY_CONFIG_SERVICE_ANDROID_H_
« no previous file with comments | « net/proxy/proxy_config_service.h ('k') | net/proxy/proxy_config_service_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698