summaryrefslogtreecommitdiffstats
path: root/views/view.cc
diff options
context:
space:
mode:
authorjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-08 16:28:44 +0000
committerjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-08 16:28:44 +0000
commit0e0e6d757d44f0b0a3678a714c0c09186e3aa6eb (patch)
treea2bcf52eaa02b828865954b6fb800fccee08463b /views/view.cc
parentb57c599f4d27dbd93db10033d599fbb512611788 (diff)
downloadchromium_src-0e0e6d757d44f0b0a3678a714c0c09186e3aa6eb.zip
chromium_src-0e0e6d757d44f0b0a3678a714c0c09186e3aa6eb.tar.gz
chromium_src-0e0e6d757d44f0b0a3678a714c0c09186e3aa6eb.tar.bz2
Enabling the default button behavior on Linux toolkit_views.
I had to make the KeyEvent constructor include the event flags. Also cleaned-up some unit-tests BUG=None TEST=Run the unit-tests. Review URL: http://codereview.chromium.org/266012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28397 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/view.cc')
-rw-r--r--views/view.cc6
1 files changed, 0 insertions, 6 deletions
diff --git a/views/view.cc b/views/view.cc
index 3c5d77b..232da55 100644
--- a/views/view.cc
+++ b/views/view.cc
@@ -988,8 +988,6 @@ void View::RemoveAccelerator(const Accelerator& accelerator) {
return;
}
- // TODO(port): Fix this once we have a FocusManger for Linux.
-#if defined(OS_WIN)
FocusManager* focus_manager = GetFocusManager();
if (focus_manager) {
// We may not have a FocusManager if the window containing us is being
@@ -997,7 +995,6 @@ void View::RemoveAccelerator(const Accelerator& accelerator) {
// nothing to unregister.
focus_manager->UnregisterAccelerator(accelerator, this);
}
-#endif
}
void View::ResetAccelerators() {
@@ -1047,8 +1044,6 @@ void View::UnregisterAccelerators() {
RootView* root_view = GetRootView();
if (root_view) {
- // TODO(port): Fix this once we have a FocusManger for Linux.
-#if defined(OS_WIN)
FocusManager* focus_manager = GetFocusManager();
if (focus_manager) {
// We may not have a FocusManager if the window containing us is being
@@ -1059,7 +1054,6 @@ void View::UnregisterAccelerators() {
accelerators_->clear();
accelerators_.reset();
registered_accelerator_count_ = 0;
-#endif
}
}