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 606 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
617 frame_->Show(); | 617 frame_->Show(); |
618 | 618 |
619 force_location_bar_focus_ = false; | 619 force_location_bar_focus_ = false; |
620 | 620 |
621 browser()->OnWindowDidShow(); | 621 browser()->OnWindowDidShow(); |
622 } | 622 } |
623 | 623 |
624 void BrowserView::ShowInactive() { | 624 void BrowserView::ShowInactive() { |
625 if (!frame_->IsVisible()) | 625 if (!frame_->IsVisible()) |
626 frame_->ShowInactive(); | 626 frame_->ShowInactive(); |
627 | |
628 #if defined(USE_AURA) | |
629 if (!icon_updater_.get()) | |
sky
2012/03/05 15:20:25
Why is this needed?
sky
2012/03/05 15:22:52
I see why it's needed. Could you move the creation
stevenjb
2012/03/05 19:50:06
Done.
| |
630 icon_updater_.reset(LauncherUpdater::Create(browser_.get())); | |
631 #endif // defined(USE_AURA) | |
627 } | 632 } |
628 | 633 |
629 void BrowserView::SetBounds(const gfx::Rect& bounds) { | 634 void BrowserView::SetBounds(const gfx::Rect& bounds) { |
630 ExitFullscreen(); | 635 ExitFullscreen(); |
631 GetWidget()->SetBounds(bounds); | 636 GetWidget()->SetBounds(bounds); |
632 } | 637 } |
633 | 638 |
634 void BrowserView::Close() { | 639 void BrowserView::Close() { |
635 frame_->Close(); | 640 frame_->Close(); |
636 } | 641 } |
(...skipping 1923 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2560 browser::CreateViewsBubble(bubble); | 2565 browser::CreateViewsBubble(bubble); |
2561 bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE); | 2566 bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE); |
2562 bubble->Show(); | 2567 bubble->Show(); |
2563 } | 2568 } |
2564 | 2569 |
2565 void BrowserView::ShowAvatarBubbleFromAvatarButton() { | 2570 void BrowserView::ShowAvatarBubbleFromAvatarButton() { |
2566 AvatarMenuButton* button = frame_->GetAvatarMenuButton(); | 2571 AvatarMenuButton* button = frame_->GetAvatarMenuButton(); |
2567 if (button) | 2572 if (button) |
2568 button->ShowAvatarBubble(); | 2573 button->ShowAvatarBubble(); |
2569 } | 2574 } |
OLD | NEW |