diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-18 08:58:56 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-18 08:58:56 +0000 |
| commit | b76fc2a098e5999ff70f3866fb15c0d95e3a5ad6 (patch) | |
| tree | 6eff08a48a1bef3717db22cbef52542f50ab0d32 /ui | |
| parent | 5cb44bb08b9f929cd0ed12b2caad61f7ecf8c760 (diff) | |
| download | chromium_src-b76fc2a098e5999ff70f3866fb15c0d95e3a5ad6.zip chromium_src-b76fc2a098e5999ff70f3866fb15c0d95e3a5ad6.tar.gz chromium_src-b76fc2a098e5999ff70f3866fb15c0d95e3a5ad6.tar.bz2 | |
Remove MissingSystemFileDialog; use Views textfields instead.
Avoid Windows native textfields/omnibox if msftedit.dll fails to load.
Remove the dialog that previously showed a warning if the dll load failed.
TODO(followup): Remove the support issue: https://support.google.com/chrome/?p=e_blankomnibox
BUG=131660
TEST=NativeTextfieldViews and OmniboxViewViews are used if msftedit.dll cannot be loaded.
R=pkasting@chromium.org
Review URL: https://chromiumcodereview.appspot.com/14744017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200973 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/views/controls/textfield/textfield.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ui/views/controls/textfield/textfield.cc b/ui/views/controls/textfield/textfield.cc index 646cdb5..75471a3 100644 --- a/ui/views/controls/textfield/textfield.cc +++ b/ui/views/controls/textfield/textfield.cc @@ -60,6 +60,10 @@ bool Textfield::IsViewsTextfieldEnabled() { // The new dialog style cannot host native Windows textfield controls. if (switches::IsNewDialogStyleEnabled()) return true; + // Avoid native Windows Textfields if the RichEdit library is not available. + static const HMODULE loaded_msftedit_dll = LoadLibrary(L"msftedit.dll"); + if (!loaded_msftedit_dll) + return true; #endif return true; } |