4 files changed, 16 insertions, 3 deletions
diff --git a/chrome/browser/views/frame/browser_frame_gtk.cc b/chrome/browser/views/frame/browser_frame_gtk.cc
index 25303f6..9e1699c 100644
--- a/chrome/browser/views/frame/browser_frame_gtk.cc
+++ b/chrome/browser/views/frame/browser_frame_gtk.cc
@@ -158,6 +158,10 @@ void BrowserFrameGtk::IsActiveChanged() {
   views::WidgetGtk::IsActiveChanged();
 }
 
+void BrowserFrameGtk::SetInitialFocus() {
+  browser_view_->RestoreFocus();
+}
+
 bool BrowserFrameGtk::GetAccelerator(int cmd_id,
                                      menus::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 5ccda8e..93330c1 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,
   virtual ThemeProvider* GetThemeProvider() const;
   virtual ThemeProvider* GetDefaultThemeProvider() const;
   virtual void IsActiveChanged();
+  virtual void SetInitialFocus();
 
  protected:
   void set_browser_frame_view(BrowserNonClientFrameView* browser_frame_view) {
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index 87264f4..232d99f 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -676,9 +676,7 @@ void BrowserView::Show() {
   //
   // If we do find there are cases where we need to restore the focus on show,
   // that should be added and this should be removed.
-  TabContents* selected_tab_contents = GetSelectedTabContents();
-  if (selected_tab_contents)
-    selected_tab_contents->view()->RestoreFocus();
+  RestoreFocus();
 
   // Restore split offset.
   int split_offset = g_browser_process->local_state()->GetInteger(
@@ -842,6 +840,12 @@ void BrowserView::FullScreenStateChanged() {
   ProcessFullscreen(IsFullscreen());
 }
 
+void BrowserView::RestoreFocus() {
+  TabContents* selected_tab_contents = GetSelectedTabContents();
+  if (selected_tab_contents)
+    selected_tab_contents->view()->RestoreFocus();
+}
+
 LocationBar* BrowserView::GetLocationBar() const {
   return toolbar_->location_bar();
 }
diff --git a/chrome/browser/views/frame/browser_view.h b/chrome/browser/views/frame/browser_view.h
index 1cdca86a..e811334 100644
--- a/chrome/browser/views/frame/browser_view.h
+++ b/chrome/browser/views/frame/browser_view.h
@@ -234,6 +234,10 @@ class BrowserView : public BrowserBubbleHost,
   // used on Linux.
   void FullScreenStateChanged();
 
+  // Restores the focused view. This is also used to set the initial focus
+  // when a new browser window is created.
+  void RestoreFocus();
+
   // Called when the activation of the frame changes.
   virtual void ActivationChanged(bool activated);