diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-29 01:54:27 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-29 01:54:27 +0000 |
| commit | 4c6890190bc155e0a4350d56e5619b5befac56e5 (patch) | |
| tree | 877cc81cb83af2477c5afa5612bd6e5367786de6 /chrome | |
| parent | 8b2a62abddf7b6fc91fd248cdfe43fb3235e68c5 (diff) | |
| download | chromium_src-4c6890190bc155e0a4350d56e5619b5befac56e5.zip chromium_src-4c6890190bc155e0a4350d56e5619b5befac56e5.tar.gz chromium_src-4c6890190bc155e0a4350d56e5619b5befac56e5.tar.bz2 | |
Gets NativeTabContentsContainerGtk to compile and removes some
unneeded methods from NativeTabContentsContainerWin.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/115903
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17159 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
4 files changed, 4 insertions, 28 deletions
diff --git a/chrome/browser/views/tab_contents/native_tab_contents_container_gtk.cc b/chrome/browser/views/tab_contents/native_tab_contents_container_gtk.cc index 37bfae4..55e73dd 100644 --- a/chrome/browser/views/tab_contents/native_tab_contents_container_gtk.cc +++ b/chrome/browser/views/tab_contents/native_tab_contents_container_gtk.cc @@ -177,18 +177,6 @@ bool NativeTabContentsContainerGtk::GetAccessibleRole( } //////////////////////////////////////////////////////////////////////////////// -// NativeTabContentsContainerGtk, views::FocusTraversable overrides: - -views::FocusTraversable* - NativeTabContentsContainerGtk::GetFocusTraversableParent() { - return GetRootView(); -} - -views::View* NativeTabContentsContainerGtk::GetFocusTraversableParentView() { - return this; -} - -//////////////////////////////////////////////////////////////////////////////// // NativeTabContentsContainer, public: // static diff --git a/chrome/browser/views/tab_contents/native_tab_contents_container_win.cc b/chrome/browser/views/tab_contents/native_tab_contents_container_win.cc index c715d7d..eb6e75f 100644 --- a/chrome/browser/views/tab_contents/native_tab_contents_container_win.cc +++ b/chrome/browser/views/tab_contents/native_tab_contents_container_win.cc @@ -161,18 +161,6 @@ bool NativeTabContentsContainerWin::GetAccessibleRole( } //////////////////////////////////////////////////////////////////////////////// -// NativeTabContentsContainerWin, views::FocusTraversable overrides: - -views::FocusTraversable* - NativeTabContentsContainerWin::GetFocusTraversableParent() { - return GetRootView(); -} - -views::View* NativeTabContentsContainerWin::GetFocusTraversableParentView() { - return this; -} - -//////////////////////////////////////////////////////////////////////////////// // NativeTabContentsContainer, public: // static diff --git a/chrome/browser/views/tab_contents/native_tab_contents_container_win.h b/chrome/browser/views/tab_contents/native_tab_contents_container_win.h index 92ed769..819ba30 100644 --- a/chrome/browser/views/tab_contents/native_tab_contents_container_win.h +++ b/chrome/browser/views/tab_contents/native_tab_contents_container_win.h @@ -31,10 +31,6 @@ class NativeTabContentsContainerWin : public NativeTabContentsContainer, virtual void AboutToRequestFocusFromTabTraversal(bool reverse); virtual bool GetAccessibleRole(AccessibilityTypes::Role* role); - // Overridden from HWNDView: - virtual views::FocusTraversable* GetFocusTraversableParent(); - virtual views::View* GetFocusTraversableParentView(); - private: TabContentsContainer* container_; diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 6fd4a7f..b6bbeca 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1517,6 +1517,8 @@ 'browser/views/tab_contents/tab_contents_container.cc', 'browser/views/tab_contents/tab_contents_container.h', 'browser/views/tab_contents/native_tab_contents_container.h', + 'browser/views/tab_contents/native_tab_contents_container_gtk.cc', + 'browser/views/tab_contents/native_tab_contents_container_gtk.h', 'browser/views/tab_contents/native_tab_contents_container_win.cc', 'browser/views/tab_contents/native_tab_contents_container_win.h', 'browser/views/tabs/dragged_tab_controller.cc', @@ -1739,6 +1741,8 @@ ['include', '^browser/views/status_bubble_views.h'], ['include', '^browser/views/tab_contents/native_tab_contents_container_gtk.cc'], ['include', '^browser/views/tab_contents/native_tab_contents_container_gtk.h'], + ['include', '^browser/views/tab_contents/tab_contents_container.cc'], + ['include', '^browser/views/tab_contents/tab_contents_container.h'], ['include', '^browser/views/tabs/dragged_tab_view.cc'], ['include', '^browser/views/tabs/dragged_tab_view.h'], ['include', '^browser/views/tabs/tab.cc'], |