OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/passwords/manage_passwords_icon_view.h" | 5 #include "chrome/browser/ui/views/passwords/manage_passwords_icon_view.h" |
6 | 6 |
7 #include "chrome/app/chrome_command_ids.h" | 7 #include "chrome/app/chrome_command_ids.h" |
8 #include "chrome/browser/command_updater.h" | 8 #include "chrome/browser/command_updater.h" |
9 #include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h" | 9 #include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h" |
10 #include "chrome/browser/ui/view_ids.h" | 10 #include "chrome/browser/ui/view_ids.h" |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
46 if (state() == password_manager::ui::BLACKLIST_STATE) | 46 if (state() == password_manager::ui::BLACKLIST_STATE) |
47 icon_id_ = active() ? IDR_SAVE_PASSWORD_DISABLED_ACTIVE | 47 icon_id_ = active() ? IDR_SAVE_PASSWORD_DISABLED_ACTIVE |
48 : IDR_SAVE_PASSWORD_DISABLED_INACTIVE; | 48 : IDR_SAVE_PASSWORD_DISABLED_INACTIVE; |
49 else if (password_manager::ui::IsPendingState(state())) | 49 else if (password_manager::ui::IsPendingState(state())) |
50 tooltip_text_id_ = IDS_PASSWORD_MANAGER_TOOLTIP_SAVE; | 50 tooltip_text_id_ = IDS_PASSWORD_MANAGER_TOOLTIP_SAVE; |
51 | 51 |
52 SetVisible(true); | 52 SetVisible(true); |
53 SetImage(ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(icon_id_)); | 53 SetImage(ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(icon_id_)); |
54 SetTooltipText(l10n_util::GetStringUTF16(tooltip_text_id_)); | 54 SetTooltipText(l10n_util::GetStringUTF16(tooltip_text_id_)); |
55 | 55 |
56 if (password_manager::ui::PENDING_PASSWORD_AND_BUBBLE_STATE) { | 56 // We may be about to automatically pop up a ManagePasswordsBubbleView. |
57 // We're about the automatically pop up a ManagePasswordsBubbleView. | 57 // Force layout of the icon's parent now; the bubble will be incorrectly |
58 // Force layout of the icon's parent now; the bubble will be incorrectly | 58 // positioned otherwise, as the icon won't have been drawn into position. |
59 // positioned otherwise, as the icon won't have been drawn into position. | 59 parent()->Layout(); |
60 parent()->Layout(); | |
61 } | |
62 } | 60 } |
63 | 61 |
64 bool ManagePasswordsIconView::IsBubbleShowing() const { | 62 bool ManagePasswordsIconView::IsBubbleShowing() const { |
65 return ManagePasswordsBubbleView::IsShowing(); | 63 return ManagePasswordsBubbleView::IsShowing(); |
66 } | 64 } |
67 | 65 |
68 void ManagePasswordsIconView::OnExecuting( | 66 void ManagePasswordsIconView::OnExecuting( |
69 BubbleIconView::ExecuteSource source) { | 67 BubbleIconView::ExecuteSource source) { |
70 } | 68 } |
OLD | NEW |