| 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 1616 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1627 views::View* BrowserView::GetContentsView() { | 1627 views::View* BrowserView::GetContentsView() { |
| 1628 return contents_container_; | 1628 return contents_container_; |
| 1629 } | 1629 } |
| 1630 | 1630 |
| 1631 views::ClientView* BrowserView::CreateClientView(views::Window* window) { | 1631 views::ClientView* BrowserView::CreateClientView(views::Window* window) { |
| 1632 set_window(window); | 1632 set_window(window); |
| 1633 return this; | 1633 return this; |
| 1634 } | 1634 } |
| 1635 | 1635 |
| 1636 void BrowserView::OnWindowActivationChanged(bool active) { | 1636 void BrowserView::OnWindowActivationChanged(bool active) { |
| 1637 if (active) | 1637 if (active) { |
| 1638 BrowserList::SetLastActive(browser_.get()); | 1638 BrowserList::SetLastActive(browser_.get()); |
| 1639 browser_->OnWindowActivated(); |
| 1640 } |
| 1639 } | 1641 } |
| 1640 | 1642 |
| 1641 void BrowserView::OnWindowBeginUserBoundsChange() { | 1643 void BrowserView::OnWindowBeginUserBoundsChange() { |
| 1642 TabContents* tab_contents = GetSelectedTabContents(); | 1644 TabContents* tab_contents = GetSelectedTabContents(); |
| 1643 if (tab_contents) | 1645 if (tab_contents) |
| 1644 tab_contents->WindowMoveOrResizeStarted(); | 1646 tab_contents->WindowMoveOrResizeStarted(); |
| 1645 } | 1647 } |
| 1646 | 1648 |
| 1647 void BrowserView::OnWidgetMove() { | 1649 void BrowserView::OnWidgetMove() { |
| 1648 // Cancel any tabstrip animations, some of them may be invalidated by the | 1650 // Cancel any tabstrip animations, some of them may be invalidated by the |
| (...skipping 937 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2586 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); | 2588 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); |
| 2587 | 2589 |
| 2588 return view; | 2590 return view; |
| 2589 } | 2591 } |
| 2590 #endif | 2592 #endif |
| 2591 | 2593 |
| 2592 // static | 2594 // static |
| 2593 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { | 2595 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { |
| 2594 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); | 2596 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); |
| 2595 } | 2597 } |
| OLD | NEW |