| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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/extensions/extension_message_bubble_view.h" | 5 #include "chrome/browser/ui/views/extensions/extension_message_bubble_view.h" |
| 6 | 6 |
| 7 #include "base/location.h" | 7 #include "base/location.h" |
| 8 #include "base/single_thread_task_runner.h" | 8 #include "base/single_thread_task_runner.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #include "base/thread_task_runner_handle.h" | 10 #include "base/thread_task_runner_handle.h" |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 // startup). | 70 // startup). |
| 71 base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( | 71 base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( |
| 72 FROM_HERE, base::Bind(&ExtensionMessageBubbleView::ShowBubble, | 72 FROM_HERE, base::Bind(&ExtensionMessageBubbleView::ShowBubble, |
| 73 weak_factory_.GetWeakPtr()), | 73 weak_factory_.GetWeakPtr()), |
| 74 base::TimeDelta::FromSeconds(g_bubble_appearance_wait_time)); | 74 base::TimeDelta::FromSeconds(g_bubble_appearance_wait_time)); |
| 75 } | 75 } |
| 76 | 76 |
| 77 void ExtensionMessageBubbleView::OnWidgetDestroying(views::Widget* widget) { | 77 void ExtensionMessageBubbleView::OnWidgetDestroying(views::Widget* widget) { |
| 78 // To catch Esc, we monitor destroy message. Unless the link has been clicked, | 78 // To catch Esc, we monitor destroy message. Unless the link has been clicked, |
| 79 // we assume Dismiss was the action taken. | 79 // we assume Dismiss was the action taken. |
| 80 if (!link_clicked_ && !action_taken_) | 80 if (!link_clicked_ && !action_taken_) { |
| 81 controller_->OnBubbleDismiss(); | 81 bool closed_on_deactivation = close_reason() == CloseReason::DEACTIVATION; |
| 82 controller_->OnBubbleDismiss(closed_on_deactivation); |
| 83 } |
| 82 } | 84 } |
| 83 | 85 |
| 84 void ExtensionMessageBubbleView::set_bubble_appearance_wait_time_for_testing( | 86 void ExtensionMessageBubbleView::set_bubble_appearance_wait_time_for_testing( |
| 85 int time_in_seconds) { | 87 int time_in_seconds) { |
| 86 g_bubble_appearance_wait_time = time_in_seconds; | 88 g_bubble_appearance_wait_time = time_in_seconds; |
| 87 } | 89 } |
| 88 | 90 |
| 89 //////////////////////////////////////////////////////////////////////////////// | 91 //////////////////////////////////////////////////////////////////////////////// |
| 90 // ExtensionMessageBubbleView - private. | 92 // ExtensionMessageBubbleView - private. |
| 91 | 93 |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 221 state->role = ui::AX_ROLE_ALERT; | 223 state->role = ui::AX_ROLE_ALERT; |
| 222 } | 224 } |
| 223 | 225 |
| 224 void ExtensionMessageBubbleView::ViewHierarchyChanged( | 226 void ExtensionMessageBubbleView::ViewHierarchyChanged( |
| 225 const ViewHierarchyChangedDetails& details) { | 227 const ViewHierarchyChangedDetails& details) { |
| 226 if (details.is_add && details.child == this) | 228 if (details.is_add && details.child == this) |
| 227 NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true); | 229 NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true); |
| 228 } | 230 } |
| 229 | 231 |
| 230 } // namespace extensions | 232 } // namespace extensions |
| OLD | NEW |