| 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_views.h" | 5 #include "chrome/browser/ui/views/passwords/manage_passwords_icon_views.h" |
| 6 | 6 |
| 7 #include "chrome/app/chrome_command_ids.h" | 7 #include "chrome/app/chrome_command_ids.h" |
| 8 #include "chrome/app/vector_icons/vector_icons.h" |
| 8 #include "chrome/browser/command_updater.h" | 9 #include "chrome/browser/command_updater.h" |
| 9 #include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h" | 10 #include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h" |
| 10 #include "chrome/browser/ui/views/passwords/manage_passwords_bubble_view.h" | 11 #include "chrome/browser/ui/views/passwords/manage_passwords_bubble_view.h" |
| 11 #include "chrome/grit/generated_resources.h" | 12 #include "chrome/grit/generated_resources.h" |
| 12 #include "components/password_manager/core/common/password_manager_ui.h" | 13 #include "components/password_manager/core/common/password_manager_ui.h" |
| 13 #include "ui/base/l10n/l10n_util.h" | 14 #include "ui/base/l10n/l10n_util.h" |
| 14 #include "ui/base/resource/resource_bundle.h" | 15 #include "ui/base/resource/resource_bundle.h" |
| 15 #include "ui/gfx/vector_icons_public.h" | |
| 16 | 16 |
| 17 ManagePasswordsIconViews::ManagePasswordsIconViews(CommandUpdater* updater) | 17 ManagePasswordsIconViews::ManagePasswordsIconViews(CommandUpdater* updater) |
| 18 : BubbleIconView(updater, IDC_MANAGE_PASSWORDS_FOR_PAGE), | 18 : BubbleIconView(updater, IDC_MANAGE_PASSWORDS_FOR_PAGE), |
| 19 state_(password_manager::ui::INACTIVE_STATE) { | 19 state_(password_manager::ui::INACTIVE_STATE) { |
| 20 #if defined(OS_MACOSX) | 20 #if defined(OS_MACOSX) |
| 21 SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY); | 21 SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY); |
| 22 #else | 22 #else |
| 23 SetFocusBehavior(FocusBehavior::ALWAYS); | 23 SetFocusBehavior(FocusBehavior::ALWAYS); |
| 24 #endif | 24 #endif |
| 25 | 25 |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 // If it still somehow got this key event, the bubble shouldn't be reopened. | 76 // If it still somehow got this key event, the bubble shouldn't be reopened. |
| 77 return true; | 77 return true; |
| 78 } | 78 } |
| 79 return BubbleIconView::OnKeyPressed(event); | 79 return BubbleIconView::OnKeyPressed(event); |
| 80 } | 80 } |
| 81 | 81 |
| 82 views::BubbleDialogDelegateView* ManagePasswordsIconViews::GetBubble() const { | 82 views::BubbleDialogDelegateView* ManagePasswordsIconViews::GetBubble() const { |
| 83 return ManagePasswordsBubbleView::manage_password_bubble(); | 83 return ManagePasswordsBubbleView::manage_password_bubble(); |
| 84 } | 84 } |
| 85 | 85 |
| 86 gfx::VectorIconId ManagePasswordsIconViews::GetVectorIcon() const { | 86 const gfx::VectorIcon& ManagePasswordsIconViews::GetVectorIcon() const { |
| 87 return gfx::VectorIconId::AUTOLOGIN; | 87 return kAutologinIcon; |
| 88 } | 88 } |
| 89 | 89 |
| 90 void ManagePasswordsIconViews::AboutToRequestFocusFromTabTraversal( | 90 void ManagePasswordsIconViews::AboutToRequestFocusFromTabTraversal( |
| 91 bool reverse) { | 91 bool reverse) { |
| 92 if (IsBubbleShowing()) | 92 if (IsBubbleShowing()) |
| 93 ManagePasswordsBubbleView::ActivateBubble(); | 93 ManagePasswordsBubbleView::ActivateBubble(); |
| 94 } | 94 } |
| OLD | NEW |