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

remove_usage_of_incognito_apis_in_the_spellchecker.patch 2.0 KB
History Raw

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

  2. From: Samuel Attard <[email protected]>
    3. 

  3. Date: Wed, 23 Oct 2019 11:43:58 -0700
    4. 

  4. Subject: remove usage of incognito APIs in the spellchecker
    5. 

  5. 

  6. chrome::GetBrowserContextRedirectedInIncognito is not available in
    7. 

  7. Electron nor do we want it to be.  We could potentially upstream a
    8. 

  8. change to move more of //chrome spellchecker logic into //components so
    9. 

  9. that we can further separate our dependency from //chrome.
    10. 

  10. 

  11. diff --git a/chrome/browser/profiles/profile_keyed_service_factory.cc b/chrome/browser/profiles/profile_keyed_service_factory.cc
    12. 

  12. index 30a7e6a641e7b17a47fb5c66fb44d3d5899b9e78..85764a533585df0abe398758e4fd510c711de375 100644
    13. 

  13. --- a/chrome/browser/profiles/profile_keyed_service_factory.cc
    14. 

  14. +++ b/chrome/browser/profiles/profile_keyed_service_factory.cc
    15. 

  15. @@ -22,6 +22,9 @@ ProfileKeyedServiceFactory::~ProfileKeyedServiceFactory() = default;
    16. 

  16.  
    17. 

  17.  content::BrowserContext* ProfileKeyedServiceFactory::GetBrowserContextToUse(
    18. 

  18.      content::BrowserContext* context) const {
    19. 

  19. +  return context;
    20. 

  20. +#if 0
    21. 

  21.    Profile* profile = Profile::FromBrowserContext(context);
    22. 

  22.    return profile_selections_.ApplyProfileSelection(profile);
    23. 

  23. +#endif
    24. 

  24.  }
    25. 

  25. diff --git a/chrome/browser/profiles/profile_selections.cc b/chrome/browser/profiles/profile_selections.cc
    26. 

  26. index 7ecd897db8830378f82733d519c00c17093636cb..7e0a4eb93ac9444d760d13736c1a2f6381fc3a7b 100644
    27. 

  27. --- a/chrome/browser/profiles/profile_selections.cc
    28. 

  28. +++ b/chrome/browser/profiles/profile_selections.cc
    29. 

  29. @@ -121,6 +121,7 @@ Profile* ProfileSelections::ApplyProfileSelection(Profile* profile) const {
    30. 

  30.  
    31. 

  31.  ProfileSelection ProfileSelections::GetProfileSelection(
    32. 

  32.      const Profile* profile) const {
    33. 

  33. +#if 0
    34. 

  34.  #if BUILDFLAG(IS_CHROMEOS_ASH)
    35. 

  35.    // This check has to be performed before the check on
    36. 

  36.    // `profile->IsRegularProfile()` because profiles that are internal ASH
    37. 

  37. @@ -156,6 +157,7 @@ ProfileSelection ProfileSelections::GetProfileSelection(
    38. 

  38.    }
    39. 

  39.  
    40. 

  40.    NOTREACHED();
    41. 

  41. +#endif
    42. 

  42.    return ProfileSelection::kNone;
    43. 

  43.  }
    44. 

  44.  
    45.