| 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 609 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 620 if (!frame_->IsVisible()) | 620 if (!frame_->IsVisible()) |
| 621 frame_->ShowInactive(); | 621 frame_->ShowInactive(); |
| 622 } | 622 } |
| 623 | 623 |
| 624 void BrowserView::SetBounds(const gfx::Rect& bounds) { | 624 void BrowserView::SetBounds(const gfx::Rect& bounds) { |
| 625 ExitFullscreen(); | 625 ExitFullscreen(); |
| 626 GetWidget()->SetBounds(bounds); | 626 GetWidget()->SetBounds(bounds); |
| 627 } | 627 } |
| 628 | 628 |
| 629 void BrowserView::Close() { | 629 void BrowserView::Close() { |
| 630 BrowserBubbleHost::Close(); | |
| 631 | |
| 632 frame_->Close(); | 630 frame_->Close(); |
| 633 } | 631 } |
| 634 | 632 |
| 635 void BrowserView::Activate() { | 633 void BrowserView::Activate() { |
| 636 frame_->Activate(); | 634 frame_->Activate(); |
| 637 } | 635 } |
| 638 | 636 |
| 639 void BrowserView::Deactivate() { | 637 void BrowserView::Deactivate() { |
| 640 frame_->Deactivate(); | 638 frame_->Deactivate(); |
| 641 } | 639 } |
| (...skipping 1027 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1669 | 1667 |
| 1670 // Cancel any tabstrip animations, some of them may be invalidated by the | 1668 // Cancel any tabstrip animations, some of them may be invalidated by the |
| 1671 // window being repositioned. | 1669 // window being repositioned. |
| 1672 // Comment out for one cycle to see if this fixes dist tests. | 1670 // Comment out for one cycle to see if this fixes dist tests. |
| 1673 // tabstrip_->DestroyDragController(); | 1671 // tabstrip_->DestroyDragController(); |
| 1674 | 1672 |
| 1675 // status_bubble_ may be NULL if this is invoked during construction. | 1673 // status_bubble_ may be NULL if this is invoked during construction. |
| 1676 if (status_bubble_.get()) | 1674 if (status_bubble_.get()) |
| 1677 status_bubble_->Reposition(); | 1675 status_bubble_->Reposition(); |
| 1678 | 1676 |
| 1679 BrowserBubbleHost::WindowMoved(); | |
| 1680 | |
| 1681 browser::HideBookmarkBubbleView(); | 1677 browser::HideBookmarkBubbleView(); |
| 1682 | 1678 |
| 1683 // Close the omnibox popup, if any. | 1679 // Close the omnibox popup, if any. |
| 1684 LocationBarView* location_bar_view = GetLocationBarView(); | 1680 LocationBarView* location_bar_view = GetLocationBarView(); |
| 1685 if (location_bar_view) | 1681 if (location_bar_view) |
| 1686 location_bar_view->location_entry()->ClosePopup(); | 1682 location_bar_view->location_entry()->ClosePopup(); |
| 1687 } | 1683 } |
| 1688 | 1684 |
| 1689 views::Widget* BrowserView::GetWidget() { | 1685 views::Widget* BrowserView::GetWidget() { |
| 1690 return View::GetWidget(); | 1686 return View::GetWidget(); |
| (...skipping 950 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2641 views::BubbleBorder::TOP_RIGHT, bounds, browser_.get()); | 2637 views::BubbleBorder::TOP_RIGHT, bounds, browser_.get()); |
| 2642 views::BubbleDelegateView::CreateBubble(bubble); | 2638 views::BubbleDelegateView::CreateBubble(bubble); |
| 2643 bubble->Show(); | 2639 bubble->Show(); |
| 2644 } | 2640 } |
| 2645 | 2641 |
| 2646 void BrowserView::ShowAvatarBubbleFromAvatarButton() { | 2642 void BrowserView::ShowAvatarBubbleFromAvatarButton() { |
| 2647 AvatarMenuButton* button = frame_->GetAvatarMenuButton(); | 2643 AvatarMenuButton* button = frame_->GetAvatarMenuButton(); |
| 2648 if (button) | 2644 if (button) |
| 2649 button->ShowAvatarBubble(); | 2645 button->ShowAvatarBubble(); |
| 2650 } | 2646 } |
| OLD | NEW |