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

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

Issue 1152373003: url: Fix the TODO in url_parse.h header. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
« no previous file with comments | « net/base/url_util.h ('k') | net/tools/tld_cleanup/tld_cleanup_util.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "net/proxy/proxy_config_service_android.h" 5 #include "net/proxy/proxy_config_service_android.h"
6 6
7 #include <sys/system_properties.h> 7 #include <sys/system_properties.h>
8 8
9 #include "base/android/jni_array.h" 9 #include "base/android/jni_array.h"
10 #include "base/android/jni_string.h" 10 #include "base/android/jni_string.h"
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/callback.h" 13 #include "base/callback.h"
14 #include "base/compiler_specific.h" 14 #include "base/compiler_specific.h"
15 #include "base/location.h" 15 #include "base/location.h"
16 #include "base/logging.h" 16 #include "base/logging.h"
17 #include "base/memory/ref_counted.h" 17 #include "base/memory/ref_counted.h"
18 #include "base/observer_list.h" 18 #include "base/observer_list.h"
19 #include "base/sequenced_task_runner.h" 19 #include "base/sequenced_task_runner.h"
20 #include "base/strings/string_tokenizer.h" 20 #include "base/strings/string_tokenizer.h"
21 #include "base/strings/string_util.h" 21 #include "base/strings/string_util.h"
22 #include "base/strings/stringprintf.h" 22 #include "base/strings/stringprintf.h"
23 #include "jni/ProxyChangeListener_jni.h" 23 #include "jni/ProxyChangeListener_jni.h"
24 #include "net/base/host_port_pair.h" 24 #include "net/base/host_port_pair.h"
25 #include "net/proxy/proxy_config.h" 25 #include "net/proxy/proxy_config.h"
26 #include "url/url_parse.h" 26 #include "url/third_party/mozilla/url_parse.h"
27 27
28 using base::android::AttachCurrentThread; 28 using base::android::AttachCurrentThread;
29 using base::android::ConvertUTF8ToJavaString; 29 using base::android::ConvertUTF8ToJavaString;
30 using base::android::ConvertJavaStringToUTF8; 30 using base::android::ConvertJavaStringToUTF8;
31 using base::android::CheckException; 31 using base::android::CheckException;
32 using base::android::ClearException; 32 using base::android::ClearException;
33 using base::android::ScopedJavaGlobalRef; 33 using base::android::ScopedJavaGlobalRef;
34 34
35 namespace net { 35 namespace net {
36 36
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
408 network_task_runner, jni_task_runner, get_property_callback)) { 408 network_task_runner, jni_task_runner, get_property_callback)) {
409 delegate_->SetupJNI(); 409 delegate_->SetupJNI();
410 delegate_->FetchInitialConfig(); 410 delegate_->FetchInitialConfig();
411 } 411 }
412 412
413 void ProxyConfigServiceAndroid::ProxySettingsChanged() { 413 void ProxyConfigServiceAndroid::ProxySettingsChanged() {
414 delegate_->ProxySettingsChanged(); 414 delegate_->ProxySettingsChanged();
415 } 415 }
416 416
417 } // namespace net 417 } // namespace net
OLDNEW
« no previous file with comments | « net/base/url_util.h ('k') | net/tools/tld_cleanup/tld_cleanup_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698