diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-18 17:25:16 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-18 17:25:16 +0000 |
| commit | 97fe97e78d76db3c5a0ee7c1baa06d1fcd082a1a (patch) | |
| tree | 3184559da8a6cf61378e393ee70ffb6745172ab0 /views/controls/native_control_win.cc | |
| parent | 98a5805bd49704ef353e3b35c616f26ff49a7f55 (diff) | |
| download | chromium_src-97fe97e78d76db3c5a0ee7c1baa06d1fcd082a1a.zip chromium_src-97fe97e78d76db3c5a0ee7c1baa06d1fcd082a1a.tar.gz chromium_src-97fe97e78d76db3c5a0ee7c1baa06d1fcd082a1a.tar.bz2 | |
views: Remove unnecessary include of combobox.h from native_control_win.h
While I'm here also remove scoped_ptr.h include (which is also unused) and
annotate with OVERRIDE the overridden methods.
R=sky@chromium.org
Review URL: http://codereview.chromium.org/7901026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101703 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/native_control_win.cc')
| -rw-r--r-- | views/controls/native_control_win.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/views/controls/native_control_win.cc b/views/controls/native_control_win.cc index 9d1af49..4a450f0 100644 --- a/views/controls/native_control_win.cc +++ b/views/controls/native_control_win.cc @@ -11,14 +11,15 @@ #include "ui/base/l10n/l10n_util_win.h" #include "ui/base/view_prop.h" #include "ui/base/win/hwnd_util.h" +#include "views/controls/combobox/combobox.h" #include "views/focus/focus_manager.h" #include "views/widget/widget.h" using ui::ViewProp; -namespace views { +const char kNativeControlWinKey[] = "__NATIVE_CONTROL_WIN__"; -static const char* const kNativeControlWinKey = "__NATIVE_CONTROL_WIN__"; +namespace views { //////////////////////////////////////////////////////////////////////////////// // NativeControlWin, public: @@ -108,7 +109,7 @@ void NativeControlWin::OnFocus() { // a native win32 control, we don't always send a native (MSAA) // focus notification. bool send_native_event = - parent_view->GetClassName() != views::Combobox::kViewClassName && + parent_view->GetClassName() != Combobox::kViewClassName && parent_view->HasFocus(); // Send the accessibility focus notification. |