| 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/avatar_menu_bubble_view.h" | 5 #include "chrome/browser/ui/views/avatar_menu_bubble_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/strings/string16.h" | 9 #include "base/strings/string16.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| (...skipping 650 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 661 profiles::LockProfile(browser_->profile()); | 661 profiles::LockProfile(browser_->profile()); |
| 662 return; | 662 return; |
| 663 } | 663 } |
| 664 | 664 |
| 665 for (size_t i = 0; i < item_views_.size(); ++i) { | 665 for (size_t i = 0; i < item_views_.size(); ++i) { |
| 666 ProfileItemView* item_view = item_views_[i]; | 666 ProfileItemView* item_view = item_views_[i]; |
| 667 if (sender == item_view) { | 667 if (sender == item_view) { |
| 668 // Clicking on the active profile shouldn't do anything. | 668 // Clicking on the active profile shouldn't do anything. |
| 669 if (!item_view->item().active) { | 669 if (!item_view->item().active) { |
| 670 avatar_menu_->SwitchToProfile( | 670 avatar_menu_->SwitchToProfile( |
| 671 i, ui::DispositionFromEventFlags(event.flags()) == NEW_WINDOW); | 671 i, ui::DispositionFromEventFlags(event.flags()) == NEW_WINDOW, |
| 672 ProfileMetrics::SWITCH_PROFILE_ICON); |
| 672 } | 673 } |
| 673 break; | 674 break; |
| 674 } | 675 } |
| 675 } | 676 } |
| 676 } | 677 } |
| 677 | 678 |
| 678 void AvatarMenuBubbleView::LinkClicked(views::Link* source, int event_flags) { | 679 void AvatarMenuBubbleView::LinkClicked(views::Link* source, int event_flags) { |
| 679 if (source == buttons_view_) { | 680 if (source == buttons_view_) { |
| 680 avatar_menu_->AddNewProfile(ProfileMetrics::ADD_NEW_USER_ICON); | 681 avatar_menu_->AddNewProfile(ProfileMetrics::ADD_NEW_USER_ICON); |
| 681 return; | 682 return; |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 803 Layout(); | 804 Layout(); |
| 804 if (GetBubbleFrameView()) | 805 if (GetBubbleFrameView()) |
| 805 SizeToContents(); | 806 SizeToContents(); |
| 806 } | 807 } |
| 807 | 808 |
| 808 void AvatarMenuBubbleView::SetBackgroundColors() { | 809 void AvatarMenuBubbleView::SetBackgroundColors() { |
| 809 for (size_t i = 0; i < item_views_.size(); ++i) { | 810 for (size_t i = 0; i < item_views_.size(); ++i) { |
| 810 item_views_[i]->OnHighlightStateChanged(); | 811 item_views_[i]->OnHighlightStateChanged(); |
| 811 } | 812 } |
| 812 } | 813 } |
| OLD | NEW |