OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/views/frame/browser_view.h" | 5 #include "chrome/browser/views/frame/browser_view.h" |
6 | 6 |
7 #if defined(OS_LINUX) | 7 #if defined(OS_LINUX) |
8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
9 #endif | 9 #endif |
10 | 10 |
(...skipping 1468 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1479 | 1479 |
1480 void BrowserView::TabSelectedAt(TabContentsWrapper* old_contents, | 1480 void BrowserView::TabSelectedAt(TabContentsWrapper* old_contents, |
1481 TabContentsWrapper* new_contents, | 1481 TabContentsWrapper* new_contents, |
1482 int index, | 1482 int index, |
1483 bool user_gesture) { | 1483 bool user_gesture) { |
1484 DCHECK(old_contents != new_contents); | 1484 DCHECK(old_contents != new_contents); |
1485 | 1485 |
1486 ProcessTabSelected(new_contents, true); | 1486 ProcessTabSelected(new_contents, true); |
1487 } | 1487 } |
1488 | 1488 |
1489 void BrowserView::TabReplacedAt(TabContentsWrapper* old_contents, | 1489 void BrowserView::TabReplacedAt(TabStripModel* tab_strip_model, |
| 1490 TabContentsWrapper* old_contents, |
1490 TabContentsWrapper* new_contents, | 1491 TabContentsWrapper* new_contents, |
1491 int index) { | 1492 int index) { |
1492 if (index != browser_->tabstrip_model()->selected_index()) | 1493 if (index != browser_->tabstrip_model()->selected_index()) |
1493 return; | 1494 return; |
1494 | 1495 |
1495 // Swap the 'active' and 'preview' and delete what was the active. | 1496 // Swap the 'active' and 'preview' and delete what was the active. |
1496 contents_->MakePreviewContentsActiveContents(); | 1497 contents_->MakePreviewContentsActiveContents(); |
1497 TabContentsContainer* old_container = contents_container_; | 1498 TabContentsContainer* old_container = contents_container_; |
1498 contents_container_ = preview_container_; | 1499 contents_container_ = preview_container_; |
1499 old_container->ChangeTabContents(NULL); | 1500 old_container->ChangeTabContents(NULL); |
(...skipping 1073 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2573 UTF16ToWide(l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))); | 2574 UTF16ToWide(l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))); |
2574 | 2575 |
2575 return view; | 2576 return view; |
2576 } | 2577 } |
2577 #endif | 2578 #endif |
2578 | 2579 |
2579 // static | 2580 // static |
2580 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { | 2581 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { |
2581 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); | 2582 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); |
2582 } | 2583 } |
OLD | NEW |