Revert "Landing tfarina CL. " because it broke Interactive UI tests on Linux and Windows.

This reverts r41640.

Review URL: http://codereview.chromium.org/1037001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41676 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 3 insertions, 51 deletions

diff --git a/views/controls/combobox/combobox.cc b/views/controls/combobox/combobox.cc
index 2edfcd9..290c141 100644
--- a/views/controls/combobox/combobox.cc
+++ b/views/controls/combobox/combobox.cc
@@ -85,27 +85,6 @@ void Combobox::PaintFocusBorder(gfx::Canvas* canvas) {
     View::PaintFocusBorder(canvas);
 }
 
-bool Combobox::GetAccessibleName(std::wstring* name) {
-  DCHECK(name);
-
-  if (!accessible_name_.empty()) {
-    *name = accessible_name_;
-    return true;
-  }
-  return false;
-}
-
-bool Combobox::GetAccessibleRole(AccessibilityTypes::Role* role) {
-  DCHECK(role);
-
-  *role = AccessibilityTypes::ROLE_COMBOBOX;
-  return true;
-}
-
-void Combobox::SetAccessibleName(const std::wstring& name) {
-  accessible_name_.assign(name);
-}
-
 void Combobox::Focus() {
   // Forward the focus to the wrapper.
   if (native_wrapper_)
diff --git a/views/controls/combobox/combobox.h b/views/controls/combobox/combobox.h
index fdf5f8e..1380051 100644
--- a/views/controls/combobox/combobox.h
+++ b/views/controls/combobox/combobox.h
@@ -5,8 +5,6 @@
 #ifndef VIEWS_CONTROLS_COMBOBOX_COMBOBOX_H_
 #define VIEWS_CONTROLS_COMBOBOX_COMBOBOX_H_
 
-#include <string>
-
 #include "views/view.h"
 
 class ComboboxModel;
@@ -42,7 +40,7 @@ class Combobox : public View {
   void ModelChanged();
 
   // Gets/Sets the selected item.
-  int selected_item() const { return selected_item_; }
+  int selected_item() const { return selected_item_; };
   void SetSelectedItem(int index);
 
   // Called when the combo box's selection is changed by the user.
@@ -57,9 +55,6 @@ class Combobox : public View {
   virtual void SetEnabled(bool enabled);
   virtual bool SkipDefaultKeyEventProcessing(const KeyEvent& e);
   virtual void PaintFocusBorder(gfx::Canvas* canvas);
-  virtual bool GetAccessibleName(std::wstring* name);
-  virtual bool GetAccessibleRole(AccessibilityTypes::Role* role);
-  virtual void SetAccessibleName(const std::wstring& name);
 
  protected:
   virtual void Focus();
@@ -80,9 +75,6 @@ class Combobox : public View {
   // The current selection.
   int selected_item_;
 
-  // The accessible name of this control.
-  std::wstring accessible_name_;
-
   DISALLOW_COPY_AND_ASSIGN(Combobox);
 };
 
diff --git a/views/controls/link.cc b/views/controls/link.cc
index 80172e2..e83c0cd 100644
--- a/views/controls/link.cc
+++ b/views/controls/link.cc
@@ -51,6 +51,7 @@ void GetColors(const SkColor* background_color,  // NULL means "use default"
     *normal_color = kNormalColor;
   }
 }
+
 }
 
 namespace views {
@@ -144,20 +145,6 @@ bool Link::SkipDefaultKeyEventProcessing(const KeyEvent& e) {
       (e.GetKeyCode() == base::VKEY_RETURN);
 }
 
-bool Link::GetAccessibleRole(AccessibilityTypes::Role* role) {
-  DCHECK(role);
-
-  *role = AccessibilityTypes::ROLE_LINK;
-  return true;
-}
-
-bool Link::GetAccessibleName(std::wstring* name) {
-  DCHECK(name);
-
-  *name = GetText();
-  return !name->empty();
-}
-
 void Link::SetFont(const gfx::Font& font) {
   Label::SetFont(font);
   ValidateStyle();
diff --git a/views/controls/link.h b/views/controls/link.h
index 4ef7af3..8c281e3 100644
--- a/views/controls/link.h
+++ b/views/controls/link.h
@@ -5,8 +5,6 @@
 #ifndef VIEWS_CONTROLS_LINK_H_
 #define VIEWS_CONTROLS_LINK_H_
 
-#include <string>
-
 #include "views/controls/label.h"
 
 namespace views {
@@ -35,7 +33,7 @@ class LinkController {
 class Link : public Label {
  public:
   Link();
-  explicit Link(const std::wstring& title);
+  Link(const std::wstring& title);
   virtual ~Link();
 
   void SetController(LinkController* controller);
@@ -49,10 +47,6 @@ class Link : public Label {
   virtual bool OnKeyPressed(const KeyEvent& e);
   virtual bool SkipDefaultKeyEventProcessing(const KeyEvent& e);
 
-  // Accessibility accessors, overridden from View:
-  virtual bool GetAccessibleRole(AccessibilityTypes::Role* role);
-  virtual bool GetAccessibleName(std::wstring* name);
-
   virtual void SetFont(const gfx::Font& font);
 
   // Set whether the link is enabled.