diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-18 18:32:45 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-11-18 18:38:07 +0000 |
| commit | 513209b27ff55e2841eac0e4120199c23acce758 (patch) | |
| tree | aeba30bb08c5f47c57003544e378a377c297eee6 /chrome/browser/chromeos/wm_overview_controller.cc | |
| parent | 164f7496de0fbee436b385a79ead9e3cb81a50c1 (diff) | |
| download | external_chromium-513209b27ff55e2841eac0e4120199c23acce758.zip external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.gz external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.bz2 | |
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
Diffstat (limited to 'chrome/browser/chromeos/wm_overview_controller.cc')
| -rw-r--r-- | chrome/browser/chromeos/wm_overview_controller.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/wm_overview_controller.cc b/chrome/browser/chromeos/wm_overview_controller.cc index f4bf91d..785651a 100644 --- a/chrome/browser/chromeos/wm_overview_controller.cc +++ b/chrome/browser/chromeos/wm_overview_controller.cc @@ -317,6 +317,12 @@ void BrowserListener::ShowSnapshots() { } void BrowserListener::SelectTab(int index, uint32 timestamp) { + // Ignore requests to switch to non-existent tabs (the window manager gets + // notified asynchronously about the number of tabs in each window, so there's + // no guarantee that the messages that it sends us will make sense). + if (index < 0 || index >= browser_->tab_count()) + return; + uint32 old_value = select_tab_timestamp_; select_tab_timestamp_ = timestamp; browser_->SelectTabContentsAt(index, true); |