| 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 1617 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1628 views::View* BrowserView::GetContentsView() { | 1628 views::View* BrowserView::GetContentsView() { |
| 1629 return contents_container_; | 1629 return contents_container_; |
| 1630 } | 1630 } |
| 1631 | 1631 |
| 1632 views::ClientView* BrowserView::CreateClientView(views::Widget* widget) { | 1632 views::ClientView* BrowserView::CreateClientView(views::Widget* widget) { |
| 1633 return this; | 1633 return this; |
| 1634 } | 1634 } |
| 1635 | 1635 |
| 1636 void BrowserView::OnWidgetActivationChanged(views::Widget* widget, | 1636 void BrowserView::OnWidgetActivationChanged(views::Widget* widget, |
| 1637 bool active) { | 1637 bool active) { |
| 1638 #if defined(USE_AURA) |
| 1639 if (icon_updater_.get()) |
| 1640 icon_updater_->BrowserActivationStateChanged(); |
| 1641 #endif |
| 1642 |
| 1638 if (active) { | 1643 if (active) { |
| 1639 BrowserList::SetLastActive(browser_.get()); | 1644 BrowserList::SetLastActive(browser_.get()); |
| 1640 browser_->OnWindowActivated(); | 1645 browser_->OnWindowActivated(); |
| 1641 } | 1646 } |
| 1642 } | 1647 } |
| 1643 | 1648 |
| 1644 void BrowserView::OnWindowBeginUserBoundsChange() { | 1649 void BrowserView::OnWindowBeginUserBoundsChange() { |
| 1645 WebContents* web_contents = GetSelectedWebContents(); | 1650 WebContents* web_contents = GetSelectedWebContents(); |
| 1646 if (!web_contents) | 1651 if (!web_contents) |
| 1647 return; | 1652 return; |
| (...skipping 920 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2568 browser::CreateViewsBubble(bubble); | 2573 browser::CreateViewsBubble(bubble); |
| 2569 bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE); | 2574 bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE); |
| 2570 bubble->Show(); | 2575 bubble->Show(); |
| 2571 } | 2576 } |
| 2572 | 2577 |
| 2573 void BrowserView::ShowAvatarBubbleFromAvatarButton() { | 2578 void BrowserView::ShowAvatarBubbleFromAvatarButton() { |
| 2574 AvatarMenuButton* button = frame_->GetAvatarMenuButton(); | 2579 AvatarMenuButton* button = frame_->GetAvatarMenuButton(); |
| 2575 if (button) | 2580 if (button) |
| 2576 button->ShowAvatarBubble(); | 2581 button->ShowAvatarBubble(); |
| 2577 } | 2582 } |
| OLD | NEW |