summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tab_contents/tab_contents.h
diff options
context:
space:
mode:
authorjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-25 23:39:20 +0000
committerjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-25 23:39:20 +0000
commit8abcab400b5a1bf486bdaa7d8d77b94dfc0f0bc9 (patch)
tree0e287f4625c5e511372b63b0cf774f9354e83e17 /chrome/browser/tab_contents/tab_contents.h
parent3244d1f880a132681a190d9096aeeea85bfcbf19 (diff)
downloadchromium_src-8abcab400b5a1bf486bdaa7d8d77b94dfc0f0bc9.zip
chromium_src-8abcab400b5a1bf486bdaa7d8d77b94dfc0f0bc9.tar.gz
chromium_src-8abcab400b5a1bf486bdaa7d8d77b94dfc0f0bc9.tar.bz2
Reverting 10400.
Reverting broke the linux build Review URL: http://codereview.chromium.org/27178 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10402 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents/tab_contents.h')
-rw-r--r--chrome/browser/tab_contents/tab_contents.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/tab_contents/tab_contents.h b/chrome/browser/tab_contents/tab_contents.h
index bfd4310..13f8f34 100644
--- a/chrome/browser/tab_contents/tab_contents.h
+++ b/chrome/browser/tab_contents/tab_contents.h
@@ -446,12 +446,6 @@ class TabContents : public PageNavigator,
// Called when a ConstrainedWindow we own is moved or resized.
void DidMoveOrResize(ConstrainedWindow* window);
- // Sets focus to the tab contents window, but doesn't actually set focus to
- // a particular element in it (see also SetInitialFocus(bool) which does
- // that in different circumstances).
- // FIXME(brettw) having two SetInitialFocus that do different things is silly.
- virtual void SetInitialFocus();
-
protected:
// NotificationObserver implementation:
virtual void Observe(NotificationType type,
@@ -476,6 +470,12 @@ class TabContents : public PageNavigator,
// Protected so that others don't try to delete this directly.
virtual ~TabContents();
+ // Sets focus to the tab contents window, but doesn't actuall set focus to
+ // a particular element in it (see also SetInitialFocus(bool) which does
+ // that in different circumstances).
+ // FIXME(brettw) having two SetInitialFocus that do different things is silly.
+ virtual void SetInitialFocus();
+
// Changes the IsLoading state and notifies delegate as needed
// |details| is used to provide details on the load that just finished
// (but can be null if not applicable). Can be overridden.