summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-13 22:38:19 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-13 22:38:19 +0000
commit9a295b8b77f4ad665fa5a3ec9201d44850b38a88 (patch)
tree97cb83425070c5bcaba6d3b5c837a6f5cfac6fad /chrome
parentdae1b35cd836002ee6be56ad6436fc2d763f0bcb (diff)
downloadchromium_src-9a295b8b77f4ad665fa5a3ec9201d44850b38a88.zip
chromium_src-9a295b8b77f4ad665fa5a3ec9201d44850b38a88.tar.gz
chromium_src-9a295b8b77f4ad665fa5a3ec9201d44850b38a88.tar.bz2
Couple of views/gtk tweaks:
. Adds accelerator to list of files compiled on views/gtk. . Adds function to Screen to get monitor bounds from a window. . Adds BrowserFrameGtk::GetAccelerator to match windows. BUG=none TEST=none Review URL: http://codereview.chromium.org/275005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28902 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/views/frame/browser_frame_gtk.cc5
-rw-r--r--chrome/browser/views/frame/browser_frame_gtk.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/views/frame/browser_frame_gtk.cc b/chrome/browser/views/frame/browser_frame_gtk.cc
index 953f4a6..4b011b0 100644
--- a/chrome/browser/views/frame/browser_frame_gtk.cc
+++ b/chrome/browser/views/frame/browser_frame_gtk.cc
@@ -91,3 +91,8 @@ void BrowserFrameGtk::IsActiveChanged() {
browser_view_->ActivationChanged(IsActive());
views::WidgetGtk::IsActiveChanged();
}
+
+bool BrowserFrameGtk::GetAccelerator(int cmd_id,
+ views::Accelerator* accelerator) {
+ return browser_view_->GetAccelerator(cmd_id, accelerator);
+}
diff --git a/chrome/browser/views/frame/browser_frame_gtk.h b/chrome/browser/views/frame/browser_frame_gtk.h
index 5b8a561..297b3bd 100644
--- a/chrome/browser/views/frame/browser_frame_gtk.h
+++ b/chrome/browser/views/frame/browser_frame_gtk.h
@@ -42,6 +42,7 @@ class BrowserFrameGtk : public BrowserFrame,
protected:
// Overridden from views::WidgetGtk:
virtual views::RootView* CreateRootView();
+ virtual bool GetAccelerator(int cmd_id, views::Accelerator* accelerator);
private:
// The BrowserView is our ClientView. This is a pointer to it.