| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 1621 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1632 views::View* BrowserView::GetContentsView() { | 1632 views::View* BrowserView::GetContentsView() { |
| 1633 return contents_container_; | 1633 return contents_container_; |
| 1634 } | 1634 } |
| 1635 | 1635 |
| 1636 views::ClientView* BrowserView::CreateClientView(views::Widget* widget) { | 1636 views::ClientView* BrowserView::CreateClientView(views::Widget* widget) { |
| 1637 return this; | 1637 return this; |
| 1638 } | 1638 } |
| 1639 | 1639 |
| 1640 void BrowserView::OnWidgetActivationChanged(views::Widget* widget, | 1640 void BrowserView::OnWidgetActivationChanged(views::Widget* widget, |
| 1641 bool active) { | 1641 bool active) { |
| 1642 #if defined(USE_AURA) |
| 1643 if (icon_updater_.get()) |
| 1644 icon_updater_->BrowserActivationStateChanged(); |
| 1645 #endif |
| 1646 |
| 1642 if (active) { | 1647 if (active) { |
| 1643 BrowserList::SetLastActive(browser_.get()); | 1648 BrowserList::SetLastActive(browser_.get()); |
| 1644 browser_->OnWindowActivated(); | 1649 browser_->OnWindowActivated(); |
| 1645 } | 1650 } |
| 1646 } | 1651 } |
| 1647 | 1652 |
| 1648 void BrowserView::OnWindowBeginUserBoundsChange() { | 1653 void BrowserView::OnWindowBeginUserBoundsChange() { |
| 1649 WebContents* web_contents = GetSelectedWebContents(); | 1654 WebContents* web_contents = GetSelectedWebContents(); |
| 1650 if (!web_contents) | 1655 if (!web_contents) |
| 1651 return; | 1656 return; |
| (...skipping 920 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2572 browser::CreateViewsBubble(bubble); | 2577 browser::CreateViewsBubble(bubble); |
| 2573 bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE); | 2578 bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE); |
| 2574 bubble->Show(); | 2579 bubble->Show(); |
| 2575 } | 2580 } |
| 2576 | 2581 |
| 2577 void BrowserView::ShowAvatarBubbleFromAvatarButton() { | 2582 void BrowserView::ShowAvatarBubbleFromAvatarButton() { |
| 2578 AvatarMenuButton* button = frame_->GetAvatarMenuButton(); | 2583 AvatarMenuButton* button = frame_->GetAvatarMenuButton(); |
| 2579 if (button) | 2584 if (button) |
| 2580 button->ShowAvatarBubble(); | 2585 button->ShowAvatarBubble(); |
| 2581 } | 2586 } |
| OLD | NEW |