diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-02 00:22:09 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-02 00:22:09 +0000 |
commit | 23948b94c876ea6bdc5682a95ce9c8e344aff4c8 (patch) | |
tree | 61da3c15c6a19b0cc9e0c25a5a8758eb5bb766c4 | |
parent | 9a05b75028274c6178930613b8f396a2e982d26b (diff) | |
download | chromium_src-23948b94c876ea6bdc5682a95ce9c8e344aff4c8.zip chromium_src-23948b94c876ea6bdc5682a95ce9c8e344aff4c8.tar.gz chromium_src-23948b94c876ea6bdc5682a95ce9c8e344aff4c8.tar.bz2 |
views: Make |focusable_| a private data member instead of a protected one.
BUG=72040
TEST=None
R=ben@chromium.org
Review URL: http://codereview.chromium.org/7020040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87555 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | views/controls/button/radio_button.cc | 2 | ||||
-rw-r--r-- | views/controls/native_control.cc | 2 | ||||
-rw-r--r-- | views/view.cc | 4 | ||||
-rw-r--r-- | views/view.h | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/views/controls/button/radio_button.cc b/views/controls/button/radio_button.cc index 944ca87..40ef045 100644 --- a/views/controls/button/radio_button.cc +++ b/views/controls/button/radio_button.cc @@ -124,7 +124,7 @@ NativeButtonWrapper* NativeRadioButton::CreateWrapper() { RadioButton::RadioButton(const std::wstring& label, int group_id) : Checkbox(label) { SetGroup(group_id); - focusable_ = true; + set_focusable(true); } RadioButton::~RadioButton() { diff --git a/views/controls/native_control.cc b/views/controls/native_control.cc index 06878f4..03fc301 100644 --- a/views/controls/native_control.cc +++ b/views/controls/native_control.cc @@ -178,7 +178,7 @@ NativeControl::NativeControl() : hwnd_view_(NULL), horizontal_alignment_(CENTER), fixed_height_(-1), vertical_alignment_(CENTER) { - focusable_ = true; + set_focusable(true); } NativeControl::~NativeControl() { diff --git a/views/view.cc b/views/view.cc index 6a3018a..d1128e4 100644 --- a/views/view.cc +++ b/views/view.cc @@ -95,8 +95,7 @@ Widget* View::GetChildWidget() { // Creation and lifetime ------------------------------------------------------- View::View() - : focusable_(false), - parent_owned_(true), + : parent_owned_(true), id_(0), group_(-1), parent_(NULL), @@ -116,6 +115,7 @@ View::View() registered_accelerator_count_(0), next_focusable_view_(NULL), previous_focusable_view_(NULL), + focusable_(false), accessibility_focusable_(false), context_menu_controller_(NULL), drag_controller_(NULL) { diff --git a/views/view.h b/views/view.h index cb3545c..016d74e 100644 --- a/views/view.h +++ b/views/view.h @@ -1053,9 +1053,6 @@ class View : public AcceleratorTarget { void Focus(); void Blur(); - // Whether the view can be focused. - bool focusable_; - // System events ------------------------------------------------------------- // Called when the UI theme has changed, overriding allows individual Views to @@ -1412,6 +1409,9 @@ class View : public AcceleratorTarget { // Next view to be focused when the Shift-Tab key combination is pressed. View* previous_focusable_view_; + // Whether this view can be focused. + bool focusable_; + // Whether this view is focusable if the user requires full keyboard access, // even though it may not be normally focusable. bool accessibility_focusable_; |