| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/ui/views/frame/browser_view.h" | 5 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 6 | 6 |
| 7 #if defined(TOOLKIT_USES_GTK) | 7 #if defined(TOOLKIT_USES_GTK) |
| 8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
| 9 #endif | 9 #endif |
| 10 | 10 |
| (...skipping 1401 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1412 // Some reports seem to show that the focus manager and/or focused view can | 1412 // Some reports seem to show that the focus manager and/or focused view can |
| 1413 // be garbage at that point, it is not clear why. | 1413 // be garbage at that point, it is not clear why. |
| 1414 if (!contents->tab_contents()->is_being_destroyed()) | 1414 if (!contents->tab_contents()->is_being_destroyed()) |
| 1415 contents->view()->StoreFocus(); | 1415 contents->view()->StoreFocus(); |
| 1416 } | 1416 } |
| 1417 | 1417 |
| 1418 void BrowserView::ActiveTabChanged(TabContentsWrapper* old_contents, | 1418 void BrowserView::ActiveTabChanged(TabContentsWrapper* old_contents, |
| 1419 TabContentsWrapper* new_contents, | 1419 TabContentsWrapper* new_contents, |
| 1420 int index, | 1420 int index, |
| 1421 bool user_gesture) { | 1421 bool user_gesture) { |
| 1422 if (old_contents == new_contents) | |
| 1423 return; | |
| 1424 | |
| 1425 ProcessTabSelected(new_contents, true); | 1422 ProcessTabSelected(new_contents, true); |
| 1426 } | 1423 } |
| 1427 | 1424 |
| 1428 void BrowserView::TabReplacedAt(TabStripModel* tab_strip_model, | 1425 void BrowserView::TabReplacedAt(TabStripModel* tab_strip_model, |
| 1429 TabContentsWrapper* old_contents, | 1426 TabContentsWrapper* old_contents, |
| 1430 TabContentsWrapper* new_contents, | 1427 TabContentsWrapper* new_contents, |
| 1431 int index) { | 1428 int index) { |
| 1432 if (index != browser_->tabstrip_model()->active_index()) | 1429 if (index != browser_->tabstrip_model()->active_index()) |
| 1433 return; | 1430 return; |
| 1434 | 1431 |
| (...skipping 1182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2617 view->GetWidget()->non_client_view()->SetAccessibleName( | 2614 view->GetWidget()->non_client_view()->SetAccessibleName( |
| 2618 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); | 2615 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); |
| 2619 return view; | 2616 return view; |
| 2620 } | 2617 } |
| 2621 #endif | 2618 #endif |
| 2622 | 2619 |
| 2623 // static | 2620 // static |
| 2624 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { | 2621 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { |
| 2625 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); | 2622 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); |
| 2626 } | 2623 } |
| OLD | NEW |