diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-10 18:22:42 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-10 18:22:42 +0000 |
| commit | 83755aea535918089732adc6d4511baac46f8147 (patch) | |
| tree | 6092946810c5470b36aa3aad45fcf97f1c192f90 | |
| parent | facbe7388f4dbd77452d099d97825ca1d85f504e (diff) | |
| download | chromium_src-83755aea535918089732adc6d4511baac46f8147.zip chromium_src-83755aea535918089732adc6d4511baac46f8147.tar.gz chromium_src-83755aea535918089732adc6d4511baac46f8147.tar.bz2 | |
Reverts unloading of digital persona
They don't properly cleanup (remove hooks they install) when we unload
them, leading to all sorts of crahes.
TBR as this is a revert.
BUG=291265
TEST=none
R=cpu@chromium.org
TBR=cpu@chromium.org
Review URL: https://codereview.chromium.org/26903002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227962 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chrome_browser_main_win.cc | 12 | ||||
| -rw-r--r-- | chrome/browser/chrome_browser_main_win.h | 1 |
2 files changed, 0 insertions, 13 deletions
diff --git a/chrome/browser/chrome_browser_main_win.cc b/chrome/browser/chrome_browser_main_win.cc index 4f0a763..7be7e23 100644 --- a/chrome/browser/chrome_browser_main_win.cc +++ b/chrome/browser/chrome_browser_main_win.cc @@ -184,18 +184,6 @@ ChromeBrowserMainPartsWin::ChromeBrowserMainPartsWin( ChromeBrowserMainPartsWin::~ChromeBrowserMainPartsWin() { } -void ChromeBrowserMainPartsWin::PreEarlyInitialization() { - // DigitalPersona hooks us. Their hook can trigger sending messages from - // places we don't expect. For example, SetWindowTitle() triggering sending a - // mouse move. See 291265 for details. - HMODULE digital_persona = NULL; - if (GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, - L"DpOFeedb.dll", &digital_persona) && - digital_persona) { - FreeModule(digital_persona); - } -} - void ChromeBrowserMainPartsWin::ToolkitInitialized() { ChromeBrowserMainParts::ToolkitInitialized(); gfx::PlatformFontWin::adjust_font_callback = &AdjustUIFont; diff --git a/chrome/browser/chrome_browser_main_win.h b/chrome/browser/chrome_browser_main_win.h index 2eaf005..170f92b 100644 --- a/chrome/browser/chrome_browser_main_win.h +++ b/chrome/browser/chrome_browser_main_win.h @@ -24,7 +24,6 @@ class ChromeBrowserMainPartsWin : public ChromeBrowserMainParts { virtual ~ChromeBrowserMainPartsWin(); // BrowserParts overrides. - virtual void PreEarlyInitialization() OVERRIDE; virtual void ToolkitInitialized() OVERRIDE; virtual void PreMainMessageLoopStart() OVERRIDE; virtual int PreCreateThreads() OVERRIDE; |