summaryrefslogtreecommitdiffstats
path: root/views/controls
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-23 21:09:44 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-23 21:09:44 +0000
commitce910b9d066453ea491473c4ef9e73b163a58d6d (patch)
treef35c7ba00ec6eef19d9811182a72c91f71039610 /views/controls
parent87f90841151c3e6f177687b2c722af0898f7b350 (diff)
downloadchromium_src-ce910b9d066453ea491473c4ef9e73b163a58d6d.zip
chromium_src-ce910b9d066453ea491473c4ef9e73b163a58d6d.tar.gz
chromium_src-ce910b9d066453ea491473c4ef9e73b163a58d6d.tar.bz2
More RootView cleanup:
- SetCursor->Widget API, remove platform ifdefs from root_view.cc for cursor updating - Remove weird native focus stuff, only used by ScrollView and seems not to have any effect on old options window. This is the sort of thing that should be handled by FocusManager anyway. - Remove DefaultKeyboardHandler concept in RootView. It does seem useful, but it's broken currently, and only ScrollView uses it (and hence only the old options window, which is not long for this earth). I would like to eventually replace this with a more generalized pre-processing/hierarchy processing/post-processing based event handling design. - Add OVERRIDE to RootView overrides. BUG=72040 TEST=none Review URL: http://codereview.chromium.org/6584001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75786 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls')
-rw-r--r--views/controls/scroll_view.cc10
-rw-r--r--views/controls/scroll_view.h3
2 files changed, 0 insertions, 13 deletions
diff --git a/views/controls/scroll_view.cc b/views/controls/scroll_view.cc
index 9db46da..6a2b912 100644
--- a/views/controls/scroll_view.cc
+++ b/views/controls/scroll_view.cc
@@ -383,16 +383,6 @@ int ScrollView::GetScrollIncrement(ScrollBar* source, bool is_page,
return is_horizontal ? viewport_->width() / 5 : viewport_->height() / 5;
}
-void ScrollView::ViewHierarchyChanged(bool is_add, View *parent, View *child) {
- if (is_add) {
- RootView* rv = GetRootView();
- if (rv) {
- rv->SetDefaultKeyboardHandler(this);
- rv->SetFocusOnMousePressed(true);
- }
- }
-}
-
bool ScrollView::OnKeyPressed(const KeyEvent& event) {
bool processed = false;
diff --git a/views/controls/scroll_view.h b/views/controls/scroll_view.h
index 2a3e8fd..d8ffd15 100644
--- a/views/controls/scroll_view.h
+++ b/views/controls/scroll_view.h
@@ -72,9 +72,6 @@ class ScrollView : public View,
bool is_page,
bool is_positive);
- // Overridden to setup keyboard ui when the view hierarchy changes
- virtual void ViewHierarchyChanged(bool is_add, View *parent, View *child);
-
// Keyboard events
virtual bool OnKeyPressed(const KeyEvent& event);
virtual bool OnMouseWheel(const MouseWheelEvent& e);