Revert 219673 "Fix Views Combobox and Tree View text input."

trunk/src/ui/views/controls/combobox/combobox.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/controls/combobox/combobox.h"
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/events/event.h"
@@ skipping 122 matching lines @@
 
 bool Combobox::OnKeyPressed(const ui::KeyEvent& e) {
   return native_wrapper_ && native_wrapper_->HandleKeyPressed(e);
 }
 
 bool Combobox::OnKeyReleased(const ui::KeyEvent& e) {
   return native_wrapper_ && native_wrapper_->HandleKeyReleased(e);
 }
 
 void Combobox::OnFocus() {
-  View::OnFocus();
   // Forward the focus to the wrapper.
-  if (native_wrapper_)
+  if (native_wrapper_) {
     native_wrapper_->SetFocus();
+    NotifyAccessibilityEvent(ui::AccessibilityTypes::EVENT_FOCUS, true);
+  } else {
+    View::OnFocus();  // Will focus the RootView window (so we still get
+                      // keyboard messages).
+  }
 }
 
 void Combobox::OnBlur() {
-  View::OnBlur();
   if (selector_)
     selector_->OnViewBlur();
   if (native_wrapper_)
     native_wrapper_->HandleBlur();
 }
 
 void Combobox::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_COMBOBOX;
   state->name = accessible_name_;
   state->value = model_->GetItemAt(selected_index_);
@@ skipping 15 matching lines @@
     native_wrapper_->UpdateSelectedIndex();
     native_wrapper_->UpdateEnabled();
   }
 }
 
 const char* Combobox::GetClassName() const {
   return kViewClassName;
 }
 
 }  // namespace views