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-26 18:41:52 +0000
committerjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-26 18:41:52 +0000
commit5ae566d6f57c8c0071dad41dcd76b21a6dabe5ff (patch)
tree86b9009843aff0e724bea205342ce451855530c5 /chrome/browser/tab_contents/tab_contents.h
parent3f8cb62b2416b1365407eaaf935664509ebcef5c (diff)
downloadchromium_src-5ae566d6f57c8c0071dad41dcd76b21a6dabe5ff.zip
chromium_src-5ae566d6f57c8c0071dad41dcd76b21a6dabe5ff.tar.gz
chromium_src-5ae566d6f57c8c0071dad41dcd76b21a6dabe5ff.tar.bz2
Relanding the following:
When restoring a session, the browser is shown after a tab is selected causing the focus to be on the location bar (not tab contents for web pages). This CL ensures the tab decides where the focus should be after the browser is shown. BUG=6000 TEST=See bug R=sky Review URL: http://codereview.chromium.org/28156 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10488 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 13f8f34..bfd4310 100644
--- a/chrome/browser/tab_contents/tab_contents.h
+++ b/chrome/browser/tab_contents/tab_contents.h
@@ -446,6 +446,12 @@ 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,
@@ -470,12 +476,6 @@ 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.