Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Branch: qpt
Branches Tags
electron
/
patches
/
chromium
/
proxy_config_monitor.patch

proxy_config_monitor.patch 3.5 KB
Permalink History Raw

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192939495 
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
    2. 

  2. From: deepak1556 <[email protected]>
    3. 

  3. Date: Thu, 18 Oct 2018 17:07:12 -0700
    4. 

  4. Subject: proxy_config_monitor.patch
    5. 

  5. 

  6. Allow monitoring proxy config changes for a pref service.
    7. 

  7. 

  8. diff --git a/chrome/browser/net/proxy_config_monitor.cc b/chrome/browser/net/proxy_config_monitor.cc
    9. 

  9. index c9281f7abfbdeaa4f0d9fe3c199b34fcb5acaf2c..10c008a225d7f88bc2cc39ae0a84580f8ef10a7d 100644
    10. 

  10. --- a/chrome/browser/net/proxy_config_monitor.cc
    11. 

  11. +++ b/chrome/browser/net/proxy_config_monitor.cc
    12. 

  12. @@ -11,7 +11,9 @@
    13. 

  13.  #include "build/chromeos_buildflags.h"
    14. 

  14.  #include "chrome/browser/browser_process.h"
    15. 

  15.  #include "chrome/browser/net/proxy_service_factory.h"
    16. 

  16. +#if 0
    17. 

  17.  #include "chrome/browser/profiles/profile.h"
    18. 

  18. +#endif
    19. 

  19.  #include "components/proxy_config/pref_proxy_config_tracker_impl.h"
    20. 

  20.  #include "content/public/browser/browser_thread.h"
    21. 

  21.  #include "mojo/public/cpp/bindings/pending_remote.h"
    22. 

  22. @@ -21,12 +23,13 @@
    23. 

  23.  #include "chrome/browser/ash/profiles/profile_helper.h"
    24. 

  24.  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
    25. 

  25.  
    26. 

  26. -#if BUILDFLAG(ENABLE_EXTENSIONS)
    27. 

  27. +#if 0
    28. 

  28.  #include "chrome/browser/extensions/api/proxy/proxy_api.h"
    29. 

  29.  #endif
    30. 

  30.  
    31. 

  31.  using content::BrowserThread;
    32. 

  32.  
    33. 

  33. +#if 0
    34. 

  34.  ProxyConfigMonitor::ProxyConfigMonitor(Profile* profile) {
    35. 

  35.    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
    36. 

  36.    DCHECK(profile);
    37. 

  37. @@ -57,6 +60,7 @@ ProxyConfigMonitor::ProxyConfigMonitor(Profile* profile) {
    38. 

  38.  
    39. 

  39.    proxy_config_service_->AddObserver(this);
    40. 

  40.  }
    41. 

  41. +#endif
    42. 

  42.  
    43. 

  43.  ProxyConfigMonitor::ProxyConfigMonitor(PrefService* local_state) {
    44. 

  44.    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI) ||
    45. 

  45. @@ -136,9 +140,11 @@ void ProxyConfigMonitor::OnLazyProxyConfigPoll() {
    46. 

  46.  void ProxyConfigMonitor::OnPACScriptError(int32_t line_number,
    47. 

  47.                                            const std::string& details) {
    48. 

  48.    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
    49. 

  49. +#if 0
    50. 

  50.    extensions::ProxyEventRouter::GetInstance()->OnPACScriptError(
    51. 

  51.        g_browser_process->extension_event_router_forwarder(), profile_,
    52. 

  52.        line_number, base::UTF8ToUTF16(details));
    53. 

  53. +#endif
    54. 

  54.  }
    55. 

  55.  
    56. 

  56.  void ProxyConfigMonitor::OnRequestMaybeFailedDueToProxySettings(
    57. 

  57. @@ -152,9 +158,10 @@ void ProxyConfigMonitor::OnRequestMaybeFailedDueToProxySettings(
    58. 

  58.      // controlled.
    59. 

  59.      return;
    60. 

  60.    }
    61. 

  61. -
    62. 

  62. +#if 0
    63. 

  63.    extensions::ProxyEventRouter::GetInstance()->OnProxyError(
    64. 

  64.        g_browser_process->extension_event_router_forwarder(), profile_,
    65. 

  65.        net_error);
    66. 

  66. +#endif
    67. 

  67.  }
    68. 

  68.  #endif
    69. 

  69. diff --git a/chrome/browser/net/proxy_config_monitor.h b/chrome/browser/net/proxy_config_monitor.h
    70. 

  70. index c808604a9b586eb5524a10b7561987e5b29747ea..68980ce4bf50d6bde5329f6d45209be86d878769 100644
    71. 

  71. --- a/chrome/browser/net/proxy_config_monitor.h
    72. 

  72. +++ b/chrome/browser/net/proxy_config_monitor.h
    73. 

  73. @@ -40,11 +40,12 @@ class ProxyConfigMonitor : public net::ProxyConfigService::Observer,
    74. 

  74.  
    75. 

  75.  {
    76. 

  76.   public:
    77. 

  77. +#if 0
    78. 

  78.    // Creates a ProxyConfigMonitor that gets proxy settings from |profile| and
    79. 

  79.    // watches for changes. The created ProxyConfigMonitor must be destroyed
    80. 

  80.    // before |profile|.
    81. 

  81.    explicit ProxyConfigMonitor(Profile* profile);
    82. 

  82. -
    83. 

  83. +#endif
    84. 

  84.    // Creates a ProxyConfigMonitor that gets proxy settings from the
    85. 

  85.    // |local_state|, for use with NetworkContexts not
    86. 

  86.    // associated with a profile. Must be destroyed before |local_state|.
    87. 

  87. @@ -94,7 +95,7 @@ class ProxyConfigMonitor : public net::ProxyConfigService::Observer,
    88. 

  88.  
    89. 

  89.  #if BUILDFLAG(ENABLE_EXTENSIONS)
    90. 

  90.    mojo::ReceiverSet<network::mojom::ProxyErrorClient> error_receiver_set_;
    91. 

  91. -  raw_ptr<Profile> profile_ = nullptr;
    92. 

  92. +  // raw_ptr<Profile> profile_ = nullptr;
    93. 

  93.  #endif
    94. 

  94.  };
    95. 

  95.  
    96.