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

expose_setuseragent_on_networkcontext.patch 4.5 KB
History Raw

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

  2. From: Jeremy Apthorp <[email protected]>
    3. 

  3. Date: Wed, 28 Aug 2019 12:21:25 -0700
    4. 

  4. Subject: expose SetUserAgent on NetworkContext
    5. 

  5. 

  6. Applying
    7. 

  7. https://chromium-review.googlesource.com/c/chromium/src/+/1585083 before
    8. 

  8. it's merged. There may end up being a better way of doing this, or the
    9. 

  9. patch may be merged upstream, at which point this patch should be
    10. 

  10. removed.
    11. 

  11. 

  12. diff --git a/net/url_request/static_http_user_agent_settings.h b/net/url_request/static_http_user_agent_settings.h
    13. 

  13. index 0ccfe130f00ec3b6c75cd8ee04d5a2777e1fd00c..653829457d58bf92057cc36aa8a289703d8b0577 100644
    14. 

  14. --- a/net/url_request/static_http_user_agent_settings.h
    15. 

  15. +++ b/net/url_request/static_http_user_agent_settings.h
    16. 

  16. @@ -26,13 +26,17 @@ class NET_EXPORT StaticHttpUserAgentSettings : public HttpUserAgentSettings {
    17. 

  17.      accept_language_ = new_accept_language;
    18. 

  18.    }
    19. 

  19.  
    20. 

  20. +  void set_user_agent(const std::string& new_user_agent) {
    21. 

  21. +    user_agent_ = new_user_agent;
    22. 

  22. +  }
    23. 

  23. +
    24. 

  24.    // HttpUserAgentSettings implementation
    25. 

  25.    std::string GetAcceptLanguage() const override;
    26. 

  26.    std::string GetUserAgent() const override;
    27. 

  27.  
    28. 

  28.   private:
    29. 

  29.    std::string accept_language_;
    30. 

  30. -  const std::string user_agent_;
    31. 

  31. +  std::string user_agent_;
    32. 

  32.  
    33. 

  33.    DISALLOW_COPY_AND_ASSIGN(StaticHttpUserAgentSettings);
    34. 

  34.  };
    35. 

  35. diff --git a/services/network/network_context.cc b/services/network/network_context.cc
    36. 

  36. index 7e7e50880804583acf75206d3f5f1c6f4c3b158d..3e69113249366e4bb6e62a9fe7085f608dd59755 100644
    37. 

  37. --- a/services/network/network_context.cc
    38. 

  38. +++ b/services/network/network_context.cc
    39. 

  39. @@ -991,6 +991,13 @@ void NetworkContext::SetNetworkConditions(
    40. 

  40.                                        std::move(network_conditions));
    41. 

  41.  }
    42. 

  42.  
    43. 

  43. +void NetworkContext::SetUserAgent(const std::string& new_user_agent) {
    44. 

  44. +  // This may only be called on NetworkContexts created with a constructor that
    45. 

  45. +  // calls ApplyContextParamsToBuilder.
    46. 

  46. +  DCHECK(user_agent_settings_);
    47. 

  47. +  user_agent_settings_->set_user_agent(new_user_agent);
    48. 

  48. +}
    49. 

  49. +
    50. 

  50.  void NetworkContext::SetAcceptLanguage(const std::string& new_accept_language) {
    51. 

  51.    // This may only be called on NetworkContexts created with the constructor
    52. 

  52.    // that calls MakeURLRequestContext().
    53. 

  53. diff --git a/services/network/network_context.h b/services/network/network_context.h
    54. 

  54. index 67f0e98426345beac34bfd41be384210be5911e4..b6fcd9920fcc047d58501dccc492bb0a118e654f 100644
    55. 

  55. --- a/services/network/network_context.h
    56. 

  56. +++ b/services/network/network_context.h
    57. 

  57. @@ -234,6 +234,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
    58. 

  58.    void CloseIdleConnections(CloseIdleConnectionsCallback callback) override;
    59. 

  59.    void SetNetworkConditions(const base::UnguessableToken& throttling_profile_id,
    60. 

  60.                              mojom::NetworkConditionsPtr conditions) override;
    61. 

  61. +  void SetUserAgent(const std::string& new_user_agent) override;
    62. 

  62.    void SetAcceptLanguage(const std::string& new_accept_language) override;
    63. 

  63.    void SetEnableReferrers(bool enable_referrers) override;
    64. 

  64.  #if defined(OS_CHROMEOS)
    65. 

  65. diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
    66. 

  66. index b3a2dd03807bc8deb867c5168af5251a818389a2..541d8017d38cbede3199e0028f3b1b260bd61b34 100644
    67. 

  67. --- a/services/network/public/mojom/network_context.mojom
    68. 

  68. +++ b/services/network/public/mojom/network_context.mojom
    69. 

  69. @@ -979,6 +979,9 @@ interface NetworkContext {
    70. 

  70.    SetNetworkConditions(mojo_base.mojom.UnguessableToken throttling_profile_id,
    71. 

  71.                         NetworkConditions? conditions);
    72. 

  72.  
    73. 

  73. +  // Updates the user agent to be used for requests.
    74. 

  74. +  SetUserAgent(string new_user_agent);
    75. 

  75. +
    76. 

  76.    // Updates the Accept-Language header to be used for requests.
    77. 

  77.    SetAcceptLanguage(string new_accept_language);
    78. 

  78.  
    79. 

  79. diff --git a/services/network/test/test_network_context.h b/services/network/test/test_network_context.h
    80. 

  80. index cf8fe291c5d42ddc3fcaa4e062fcf8891a0af085..caf691e79d71982d65e10e6d398939e30f642f06 100644
    81. 

  81. --- a/services/network/test/test_network_context.h
    82. 

  82. +++ b/services/network/test/test_network_context.h
    83. 

  83. @@ -99,6 +99,7 @@ class TestNetworkContext : public mojom::NetworkContext {
    84. 

  84.    void CloseIdleConnections(CloseIdleConnectionsCallback callback) override {}
    85. 

  85.    void SetNetworkConditions(const base::UnguessableToken& throttling_profile_id,
    86. 

  86.                              mojom::NetworkConditionsPtr conditions) override {}
    87. 

  87. +  void SetUserAgent(const std::string& new_user_agent) override {}
    88. 

  88.    void SetAcceptLanguage(const std::string& new_accept_language) override {}
    89. 

  89.    void SetEnableReferrers(bool enable_referrers) override {}
    90. 

  90.  #if defined(OS_CHROMEOS)
    91.