diff options
| author | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-04 00:39:07 +0000 |
|---|---|---|
| committer | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-04 00:39:07 +0000 |
| commit | bb837f9287259862c94155cc59cfc9e1bdfe1258 (patch) | |
| tree | f23a7dabe56a4b4c9288ea022f65c090a4fc536b /views/window/non_client_view.h | |
| parent | d19e63d5bd3a61fc46bae0c527731c79abb94957 (diff) | |
| download | chromium_src-bb837f9287259862c94155cc59cfc9e1bdfe1258.zip chromium_src-bb837f9287259862c94155cc59cfc9e1bdfe1258.tar.gz chromium_src-bb837f9287259862c94155cc59cfc9e1bdfe1258.tar.bz2 | |
Revert 76825 - Refactor Views accessibility.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6581010
TBR=dmazzoni@chromium.org
Review URL: http://codereview.chromium.org/6612035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76844 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/window/non_client_view.h')
| -rw-r--r-- | views/window/non_client_view.h | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/views/window/non_client_view.h b/views/window/non_client_view.h index 10c652c..db1daff 100644 --- a/views/window/non_client_view.h +++ b/views/window/non_client_view.h @@ -69,8 +69,8 @@ class NonClientFrameView : public View { virtual void ResetWindowControls() = 0; // Overridden from View: - virtual bool HitTest(const gfx::Point& l) const OVERRIDE; - virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; + virtual bool HitTest(const gfx::Point& l) const; + virtual AccessibilityTypes::Role GetAccessibleRole(); protected: virtual void OnBoundsChanged(); @@ -205,21 +205,16 @@ class NonClientView : public View { // of a window resize message. void LayoutFrameView(); - // Set the accessible name of this view. - void SetAccessibleName(const string16& name); - // NonClientView, View overrides: - virtual gfx::Size GetPreferredSize() OVERRIDE; - virtual gfx::Size GetMinimumSize() OVERRIDE; - virtual void Layout() OVERRIDE; - virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; + virtual gfx::Size GetPreferredSize(); + virtual gfx::Size GetMinimumSize(); + virtual void Layout(); + virtual AccessibilityTypes::Role GetAccessibleRole(); protected: // NonClientView, View overrides: - virtual void ViewHierarchyChanged(bool is_add, View* parent, View* child) - OVERRIDE; - virtual views::View* GetEventHandlerForPoint(const gfx::Point& point) - OVERRIDE; + virtual void ViewHierarchyChanged(bool is_add, View* parent, View* child); + virtual views::View* GetEventHandlerForPoint(const gfx::Point& point); private: // The frame that hosts this NonClientView. @@ -235,9 +230,6 @@ class NonClientView : public View { // dynamically as the system settings change. scoped_ptr<NonClientFrameView> frame_view_; - // The accessible name of this view. - string16 accessible_name_; - DISALLOW_COPY_AND_ASSIGN(NonClientView); }; |