Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(38)

Side by Side Diff: chrome/browser/ui/passwords/manage_passwords_icon.cc

Issue 1028243004: Hide the password bubble when the underlying ManagePasswordsUIController changes its state. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add a Mac test Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/passwords/manage_passwords_icon.h" 5 #include "chrome/browser/ui/passwords/manage_passwords_icon.h"
6 6
7 #include "chrome/grit/generated_resources.h" 7 #include "chrome/grit/generated_resources.h"
8 #include "grit/theme_resources.h" 8 #include "grit/theme_resources.h"
9 9
10 ManagePasswordsIcon::ManagePasswordsIcon() 10 ManagePasswordsIcon::ManagePasswordsIcon()
(...skipping 10 matching lines...) Expand all
21 if (active_ == active) 21 if (active_ == active)
22 return; 22 return;
23 active_ = active; 23 active_ = active;
24 UpdateIDs(); 24 UpdateIDs();
25 UpdateVisibleUI(); 25 UpdateVisibleUI();
26 } 26 }
27 27
28 void ManagePasswordsIcon::SetState(password_manager::ui::State state) { 28 void ManagePasswordsIcon::SetState(password_manager::ui::State state) {
29 if (state_ == state) 29 if (state_ == state)
30 return; 30 return;
31 OnChangingState();
31 state_ = state; 32 state_ = state;
32 UpdateIDs(); 33 UpdateIDs();
33 UpdateVisibleUI(); 34 UpdateVisibleUI();
34 } 35 }
35 36
36 void ManagePasswordsIcon::UpdateIDs() { 37 void ManagePasswordsIcon::UpdateIDs() {
37 // If the icon is inactive: clear out its image and tooltip and exit early. 38 // If the icon is inactive: clear out its image and tooltip and exit early.
38 if (state() == password_manager::ui::INACTIVE_STATE) { 39 if (state() == password_manager::ui::INACTIVE_STATE) {
39 icon_id_ = 0; 40 icon_id_ = 0;
40 tooltip_text_id_ = 0; 41 tooltip_text_id_ = 0;
41 return; 42 return;
42 } 43 }
43 44
44 // Otherwise, start with the correct values for MANAGE_STATE, and adjust 45 // Otherwise, start with the correct values for MANAGE_STATE, and adjust
45 // things accordingly if we're either in BLACKLIST_STATE or PENDING_STATE. 46 // things accordingly if we're either in BLACKLIST_STATE or PENDING_STATE.
46 // TODO(dconnelly): Figure out how to share the resources with Android. 47 // TODO(dconnelly): Figure out how to share the resources with Android.
47 #if !defined(OS_ANDROID) 48 #if !defined(OS_ANDROID)
48 icon_id_ = active() ? IDR_SAVE_PASSWORD_ACTIVE : IDR_SAVE_PASSWORD_INACTIVE; 49 icon_id_ = active() ? IDR_SAVE_PASSWORD_ACTIVE : IDR_SAVE_PASSWORD_INACTIVE;
49 tooltip_text_id_ = IDS_PASSWORD_MANAGER_TOOLTIP_MANAGE; 50 tooltip_text_id_ = IDS_PASSWORD_MANAGER_TOOLTIP_MANAGE;
50 if (state() == password_manager::ui::BLACKLIST_STATE) 51 if (state() == password_manager::ui::BLACKLIST_STATE)
51 icon_id_ = active() ? IDR_SAVE_PASSWORD_DISABLED_ACTIVE 52 icon_id_ = active() ? IDR_SAVE_PASSWORD_DISABLED_ACTIVE
52 : IDR_SAVE_PASSWORD_DISABLED_INACTIVE; 53 : IDR_SAVE_PASSWORD_DISABLED_INACTIVE;
53 else if (state() == password_manager::ui::PENDING_PASSWORD_STATE) 54 else if (state() == password_manager::ui::PENDING_PASSWORD_STATE)
54 tooltip_text_id_ = IDS_PASSWORD_MANAGER_TOOLTIP_SAVE; 55 tooltip_text_id_ = IDS_PASSWORD_MANAGER_TOOLTIP_SAVE;
55 #endif 56 #endif
56 } 57 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/passwords/manage_passwords_icon.h ('k') | chrome/browser/ui/passwords/manage_passwords_icon_mock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698