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 1960 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1971 browser_->tabstrip_model()->AddObserver(aeropeek_manager_.get()); | 1971 browser_->tabstrip_model()->AddObserver(aeropeek_manager_.get()); |
1972 } | 1972 } |
1973 #endif | 1973 #endif |
1974 | 1974 |
1975 // We're now initialized and ready to process Layout requests. | 1975 // We're now initialized and ready to process Layout requests. |
1976 ignore_layout_ = false; | 1976 ignore_layout_ = false; |
1977 | 1977 |
1978 #if defined(USE_AURA) | 1978 #if defined(USE_AURA) |
1979 // Add launcher item if we're using the launcher and this type of browser | 1979 // Add launcher item if we're using the launcher and this type of browser |
1980 // needs an item. | 1980 // needs an item. |
1981 aura_shell::LauncherItemType type; | 1981 ash::LauncherItemType type; |
1982 if (aura_shell::Shell::GetInstance()->launcher() && | 1982 if (ash::Shell::GetInstance()->launcher() && |
1983 ChromeShellDelegate::ShouldCreateLauncherItemForBrowser(browser_.get(), | 1983 ChromeShellDelegate::ShouldCreateLauncherItemForBrowser(browser_.get(), |
1984 &type)) { | 1984 &type)) { |
1985 icon_updater_.reset(new LauncherIconUpdater( | 1985 icon_updater_.reset(new LauncherIconUpdater( |
1986 browser_->tabstrip_model(), | 1986 browser_->tabstrip_model(), |
1987 aura_shell::Shell::GetInstance()->launcher()->model(), | 1987 ash::Shell::GetInstance()->launcher()->model(), |
1988 frame_->GetNativeWindow())); | 1988 frame_->GetNativeWindow())); |
1989 } | 1989 } |
1990 #endif // defined(USE_AURA) | 1990 #endif // defined(USE_AURA) |
1991 } | 1991 } |
1992 | 1992 |
1993 void BrowserView::LoadingAnimationCallback() { | 1993 void BrowserView::LoadingAnimationCallback() { |
1994 base::TimeTicks now = base::TimeTicks::Now(); | 1994 base::TimeTicks now = base::TimeTicks::Now(); |
1995 if (!last_animation_time_.is_null()) { | 1995 if (!last_animation_time_.is_null()) { |
1996 UMA_HISTOGRAM_TIMES( | 1996 UMA_HISTOGRAM_TIMES( |
1997 "Tabs.LoadingAnimationTime", | 1997 "Tabs.LoadingAnimationTime", |
(...skipping 641 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2639 browser::CreateViewsBubble(bubble); | 2639 browser::CreateViewsBubble(bubble); |
2640 bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE); | 2640 bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE); |
2641 bubble->Show(); | 2641 bubble->Show(); |
2642 } | 2642 } |
2643 | 2643 |
2644 void BrowserView::ShowAvatarBubbleFromAvatarButton() { | 2644 void BrowserView::ShowAvatarBubbleFromAvatarButton() { |
2645 AvatarMenuButton* button = frame_->GetAvatarMenuButton(); | 2645 AvatarMenuButton* button = frame_->GetAvatarMenuButton(); |
2646 if (button) | 2646 if (button) |
2647 button->ShowAvatarBubble(); | 2647 button->ShowAvatarBubble(); |
2648 } | 2648 } |
OLD | NEW |