diff options
| author | alicet@chromium.org <alicet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-21 17:49:45 +0000 |
|---|---|---|
| committer | alicet@chromium.org <alicet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-21 17:49:45 +0000 |
| commit | 997eefeb53a724086a0df0e88fd5c0e430380176 (patch) | |
| tree | e5c0731e334b021285cdc235856c83bfae2c54fd /ui/views | |
| parent | 8b72f13280f6ba0ca8f3bae19a6b39ff9a51ba35 (diff) | |
| download | chromium_src-997eefeb53a724086a0df0e88fd5c0e430380176.zip chromium_src-997eefeb53a724086a0df0e88fd5c0e430380176.tar.gz chromium_src-997eefeb53a724086a0df0e88fd5c0e430380176.tar.bz2 | |
Fix crash in native textfield views when bringing up menu.
BUG=118679
TEST=visted the page, right click to bring up menu, and it does not crash.
Review URL: http://codereview.chromium.org/9810007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128000 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views')
| -rw-r--r-- | ui/views/controls/textfield/native_textfield_views.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ui/views/controls/textfield/native_textfield_views.cc b/ui/views/controls/textfield/native_textfield_views.cc index bb74127..298b9ff 100644 --- a/ui/views/controls/textfield/native_textfield_views.cc +++ b/ui/views/controls/textfield/native_textfield_views.cc @@ -20,6 +20,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/range/range.h" #include "ui/gfx/canvas.h" +#include "ui/gfx/compositor/layer.h" #include "ui/gfx/insets.h" #include "ui/gfx/render_text.h" #include "ui/views/background.h" @@ -968,8 +969,9 @@ void NativeTextfieldViews::UpdateContextMenu() { context_menu_contents_->AddSeparator(); context_menu_contents_->AddItemWithStringId(IDS_APP_SELECT_ALL, IDS_APP_SELECT_ALL); - textfield_->GetController()->UpdateContextMenu( - context_menu_contents_.get()); + TextfieldController* controller = textfield_->GetController(); + if (controller) + controller->UpdateContextMenu(context_menu_contents_.get()); context_menu_delegate_.reset( new views::MenuModelAdapter(context_menu_contents_.get())); |