summaryrefslogtreecommitdiffstats
path: root/chrome/browser/gtk/browser_window_gtk.cc
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-20 19:37:34 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-20 19:37:34 +0000
commitfe5a8a4ff6f5758f8dbf7e6e9578df97fb8633db (patch)
tree6e65cdd055407d7787f5fbfc7f4323e892e38b3e /chrome/browser/gtk/browser_window_gtk.cc
parent6aec56b2bafcf1bffd50a097b3f03688e66006e2 (diff)
downloadchromium_src-fe5a8a4ff6f5758f8dbf7e6e9578df97fb8633db.zip
chromium_src-fe5a8a4ff6f5758f8dbf7e6e9578df97fb8633db.tar.gz
chromium_src-fe5a8a4ff6f5758f8dbf7e6e9578df97fb8633db.tar.bz2
Linux UI hook ups:
- Fix new tab focus - attach f5 for refresh Review URL: http://codereview.chromium.org/42422 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12206 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/browser_window_gtk.cc')
-rw-r--r--chrome/browser/gtk/browser_window_gtk.cc11
1 files changed, 11 insertions, 0 deletions
diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc
index 19b12e5..6ce674b 100644
--- a/chrome/browser/gtk/browser_window_gtk.cc
+++ b/chrome/browser/gtk/browser_window_gtk.cc
@@ -13,6 +13,7 @@
#include "base/path_service.h"
#include "chrome/app/chrome_dll_resource.h"
#include "chrome/browser/browser.h"
+#include "chrome/browser/browser_list.h"
#include "chrome/browser/find_bar_controller.h"
#include "chrome/browser/gtk/browser_toolbar_gtk.h"
#include "chrome/browser/gtk/find_bar_gtk.h"
@@ -22,6 +23,7 @@
#include "chrome/browser/location_bar.h"
#include "chrome/browser/renderer_host/render_widget_host_view_gtk.h"
#include "chrome/browser/tab_contents/web_contents.h"
+#include "chrome/browser/tab_contents/web_contents_view.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/resource_bundle.h"
#include "chrome/views/controls/button/text_button.h"
@@ -433,6 +435,9 @@ void BrowserWindowGtk::TabDetachedAt(TabContents* contents, int index) {
}
}
+// TODO(estade): this function should probably be unforked from the BrowserView
+// function of the same name by having a shared partial BrowserWindow
+// implementation.
void BrowserWindowGtk::TabSelectedAt(TabContents* old_contents,
TabContents* new_contents,
int index,
@@ -446,6 +451,12 @@ void BrowserWindowGtk::TabSelectedAt(TabContents* old_contents,
contents_container_->SetTabContents(new_contents);
new_contents->DidBecomeSelected();
+ // TODO(estade): after we manage browser activation, add a check to make sure
+ // we are the active browser before calling RestoreFocus().
+ if (!browser_->tabstrip_model()->closing_all() &&
+ new_contents->AsWebContents()) {
+ new_contents->AsWebContents()->view()->RestoreFocus();
+ }
// Update all the UI bits.
UpdateTitleBar();