OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 2534 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2545 break; | 2545 break; |
2546 default: | 2546 default: |
2547 // Do nothing. | 2547 // Do nothing. |
2548 break; | 2548 break; |
2549 } | 2549 } |
2550 #endif | 2550 #endif |
2551 } | 2551 } |
2552 | 2552 |
2553 void BrowserView::ShowAvatarBubbleFromAvatarButton( | 2553 void BrowserView::ShowAvatarBubbleFromAvatarButton( |
2554 AvatarBubbleMode mode, | 2554 AvatarBubbleMode mode, |
2555 const signin::ManageAccountsParams& manage_accounts_params) { | 2555 const signin::ManageAccountsParams& manage_accounts_params, |
| 2556 signin_metrics::AccessPoint access_point) { |
2556 #if defined(FRAME_AVATAR_BUTTON) | 2557 #if defined(FRAME_AVATAR_BUTTON) |
2557 // Do not show avatar bubble if there is no avatar menu button. | 2558 // Do not show avatar bubble if there is no avatar menu button. |
2558 if (!frame_->GetNewAvatarMenuButton()) | 2559 if (!frame_->GetNewAvatarMenuButton()) |
2559 return; | 2560 return; |
2560 profiles::BubbleViewMode bubble_view_mode; | 2561 profiles::BubbleViewMode bubble_view_mode; |
2561 profiles::TutorialMode tutorial_mode; | 2562 profiles::TutorialMode tutorial_mode; |
2562 profiles::BubbleViewModeFromAvatarBubbleMode(mode, &bubble_view_mode, | 2563 profiles::BubbleViewModeFromAvatarBubbleMode(mode, &bubble_view_mode, |
2563 &tutorial_mode); | 2564 &tutorial_mode); |
2564 ProfileChooserView::ShowBubble( | 2565 ProfileChooserView::ShowBubble( |
2565 bubble_view_mode, tutorial_mode, manage_accounts_params, | 2566 bubble_view_mode, tutorial_mode, manage_accounts_params, access_point, |
2566 frame_->GetNewAvatarMenuButton(), views::BubbleBorder::TOP_RIGHT, | 2567 frame_->GetNewAvatarMenuButton(), views::BubbleBorder::TOP_RIGHT, |
2567 views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE, browser()); | 2568 views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE, browser()); |
2568 ProfileMetrics::LogProfileOpenMethod(ProfileMetrics::ICON_AVATAR_BUBBLE); | 2569 ProfileMetrics::LogProfileOpenMethod(ProfileMetrics::ICON_AVATAR_BUBBLE); |
2569 #else | 2570 #else |
2570 NOTREACHED(); | 2571 NOTREACHED(); |
2571 #endif | 2572 #endif |
2572 } | 2573 } |
2573 | 2574 |
2574 int BrowserView::GetRenderViewHeightInsetWithDetachedBookmarkBar() { | 2575 int BrowserView::GetRenderViewHeightInsetWithDetachedBookmarkBar() { |
2575 if (browser_->bookmark_bar_state() != BookmarkBar::DETACHED || | 2576 if (browser_->bookmark_bar_state() != BookmarkBar::DETACHED || |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2670 return immersive_mode_controller()->IsEnabled(); | 2671 return immersive_mode_controller()->IsEnabled(); |
2671 } | 2672 } |
2672 | 2673 |
2673 views::Widget* BrowserView::GetBubbleAssociatedWidget() { | 2674 views::Widget* BrowserView::GetBubbleAssociatedWidget() { |
2674 return GetWidget(); | 2675 return GetWidget(); |
2675 } | 2676 } |
2676 | 2677 |
2677 gfx::Rect BrowserView::GetTopContainerBoundsInScreen() { | 2678 gfx::Rect BrowserView::GetTopContainerBoundsInScreen() { |
2678 return top_container_->GetBoundsInScreen(); | 2679 return top_container_->GetBoundsInScreen(); |
2679 } | 2680 } |
OLD | NEW |