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/suspicious_extension_bubble_view.h" | 5 #include "chrome/browser/ui/views/extensions/extension_message_bubble_view.h" |
6 | 6 |
7 #include "base/strings/string_number_conversions.h" | 7 #include "base/strings/string_number_conversions.h" |
8 #include "base/strings/string_util.h" | 8 #include "base/strings/string_util.h" |
9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #include "chrome/browser/extensions/dev_mode_bubble_controller.h" |
| 11 #include "chrome/browser/extensions/extension_action_manager.h" |
10 #include "chrome/browser/extensions/extension_prefs.h" | 12 #include "chrome/browser/extensions/extension_prefs.h" |
11 #include "chrome/browser/extensions/extension_service.h" | 13 #include "chrome/browser/extensions/extension_service.h" |
12 #include "chrome/browser/extensions/extension_system.h" | 14 #include "chrome/browser/extensions/extension_system.h" |
13 #include "chrome/browser/extensions/suspicious_extension_bubble_controller.h" | 15 #include "chrome/browser/extensions/suspicious_extension_bubble_controller.h" |
14 #include "chrome/browser/profiles/profile.h" | 16 #include "chrome/browser/profiles/profile.h" |
15 #include "chrome/browser/ui/browser.h" | 17 #include "chrome/browser/ui/browser.h" |
| 18 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 19 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h" |
| 20 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" |
16 #include "grit/locale_settings.h" | 21 #include "grit/locale_settings.h" |
17 #include "ui/base/accessibility/accessible_view_state.h" | 22 #include "ui/base/accessibility/accessible_view_state.h" |
18 #include "ui/base/resource/resource_bundle.h" | 23 #include "ui/base/resource/resource_bundle.h" |
19 #include "ui/views/controls/button/label_button.h" | 24 #include "ui/views/controls/button/label_button.h" |
20 #include "ui/views/controls/label.h" | 25 #include "ui/views/controls/label.h" |
21 #include "ui/views/controls/link.h" | 26 #include "ui/views/controls/link.h" |
22 #include "ui/views/layout/grid_layout.h" | 27 #include "ui/views/layout/grid_layout.h" |
| 28 #include "ui/views/view.h" |
23 #include "ui/views/widget/widget.h" | 29 #include "ui/views/widget/widget.h" |
24 | 30 |
25 namespace { | 31 namespace { |
26 | 32 |
27 // Layout constants. | 33 // Layout constants. |
28 const int kExtensionListPadding = 10; | 34 const int kExtensionListPadding = 10; |
29 const int kInsetBottomRight = 13; | 35 const int kInsetBottomRight = 13; |
30 const int kInsetLeft = 14; | 36 const int kInsetLeft = 14; |
31 const int kInsetTop = 9; | 37 const int kInsetTop = 9; |
32 const int kHeadlineMessagePadding = 4; | 38 const int kHeadlineMessagePadding = 4; |
33 const int kHeadlineRowPadding = 10; | 39 const int kHeadlineRowPadding = 10; |
34 const int kMessageBubblePadding = 11; | 40 const int kMessageBubblePadding = 11; |
35 | 41 |
36 // How many extensions to show in the bubble (max). | 42 // How many extensions to show in the bubble (max). |
37 const size_t kMaxExtensionsToShow = 7; | 43 const size_t kMaxExtensionsToShow = 7; |
38 | 44 |
39 // How long to wait until showing the bubble (in seconds). | 45 // How long to wait until showing the bubble (in seconds). |
40 const int kBubbleAppearanceWaitTime = 5; | 46 const int kBubbleAppearanceWaitTime = 5; |
41 | 47 |
42 } // namespace | 48 } // namespace |
43 | 49 |
44 //////////////////////////////////////////////////////////////////////////////// | 50 //////////////////////////////////////////////////////////////////////////////// |
45 // SuspiciousExtensionBubbleView | 51 // ExtensionMessageBubbleView |
46 | 52 |
47 namespace extensions { | 53 namespace extensions { |
48 | 54 |
49 SuspiciousExtensionBubbleView::SuspiciousExtensionBubbleView( | 55 ExtensionMessageBubbleView::ExtensionMessageBubbleView( |
50 views::View* anchor_view, | 56 views::View* anchor_view, |
51 SuspiciousExtensionBubbleController* controller) | 57 ExtensionMessageBubbleController::Delegate* delegate) |
52 : BubbleDelegateView(anchor_view, views::BubbleBorder::TOP_RIGHT), | 58 : BubbleDelegateView(anchor_view, views::BubbleBorder::TOP_RIGHT), |
53 weak_factory_(this), | 59 weak_factory_(this), |
54 controller_(controller), | 60 delegate_(delegate), |
55 headline_(NULL), | 61 headline_(NULL), |
56 learn_more_(NULL), | 62 learn_more_(NULL), |
57 dismiss_button_(NULL), | 63 dismiss_button_(NULL), |
58 link_clicked_(false) { | 64 link_clicked_(false), |
| 65 action_taken_(false) { |
59 DCHECK(anchor_view->GetWidget()); | 66 DCHECK(anchor_view->GetWidget()); |
60 set_close_on_deactivate(false); | 67 set_close_on_deactivate(false); |
61 set_move_with_anchor(true); | 68 set_move_with_anchor(true); |
62 set_close_on_esc(true); | 69 set_close_on_esc(true); |
63 | 70 |
64 // Compensate for built-in vertical padding in the anchor view's image. | 71 // Compensate for built-in vertical padding in the anchor view's image. |
65 set_anchor_view_insets(gfx::Insets(5, 0, 5, 0)); | 72 set_anchor_view_insets(gfx::Insets(5, 0, 5, 0)); |
66 } | 73 } |
67 | 74 |
68 // static | 75 // static |
69 void SuspiciousExtensionBubbleView::MaybeShow( | 76 void ExtensionMessageBubbleView::MaybeShow( |
70 Browser* browser, | 77 Browser* browser, |
| 78 ToolbarView* toolbar_view, |
71 views::View* anchor_view) { | 79 views::View* anchor_view) { |
72 SuspiciousExtensionBubbleController* controller = | 80 // The list of suspicious extensions takes priority over the dev mode bubble, |
| 81 // since that needs to be shown as soon as we disable something. The dev mode |
| 82 // bubble is not as time sensitive so we'll catch the dev mode extensions on |
| 83 // the next startup/next window that opens. That way, we're not too spammy |
| 84 // with the bubbles. |
| 85 SuspiciousExtensionBubbleController* suspicious_extensions = |
73 extensions::SuspiciousExtensionBubbleController::Get( | 86 extensions::SuspiciousExtensionBubbleController::Get( |
74 browser->profile()); | 87 browser->profile()); |
75 if (controller->HasSuspiciousExtensions()) { | 88 if (suspicious_extensions->ShouldShow()) { |
76 SuspiciousExtensionBubbleView* bubble_delegate = | 89 ExtensionMessageBubbleView* bubble_delegate = |
77 new SuspiciousExtensionBubbleView(anchor_view, controller); | 90 new ExtensionMessageBubbleView(anchor_view, suspicious_extensions); |
78 views::BubbleDelegateView::CreateBubble(bubble_delegate); | 91 views::BubbleDelegateView::CreateBubble(bubble_delegate); |
79 controller->Show(bubble_delegate); | 92 suspicious_extensions->Show(bubble_delegate); |
| 93 return; |
| 94 } |
| 95 |
| 96 DevModeBubbleController* dev_mode_extensions = |
| 97 extensions::DevModeBubbleController::Get( |
| 98 browser->profile()); |
| 99 if (dev_mode_extensions->ShouldShow()) { |
| 100 views::View* reference_view = NULL; |
| 101 BrowserActionsContainer* container = toolbar_view->browser_actions(); |
| 102 if (container->animating()) |
| 103 return; |
| 104 |
| 105 ExtensionService* service = extensions::ExtensionSystem::Get( |
| 106 browser->profile())->extension_service(); |
| 107 extensions::ExtensionActionManager* extension_action_manager = |
| 108 extensions::ExtensionActionManager::Get(browser->profile()); |
| 109 |
| 110 const ExtensionIdList extension_list = |
| 111 dev_mode_extensions->extension_id_list(); |
| 112 for (size_t i = 0; i < extension_list.size(); ++i) { |
| 113 const Extension* extension = |
| 114 service->GetExtensionById(extension_list[i], false); |
| 115 if (!extension) |
| 116 continue; |
| 117 reference_view = container->GetBrowserActionView( |
| 118 extension_action_manager->GetBrowserAction(*extension)); |
| 119 if (reference_view && reference_view->visible()) |
| 120 break; // Found a good candidate. |
| 121 } |
| 122 if (reference_view) { |
| 123 // If we have a view, it means we found a browser action and we want to |
| 124 // point to the chevron, not the hotdog menu. |
| 125 if (!reference_view->visible()) |
| 126 reference_view = container->chevron(); // It's hidden, use the chevron. |
| 127 } |
| 128 if (reference_view && reference_view->visible()) |
| 129 anchor_view = reference_view; // Catch-all is the hotdog menu. |
| 130 |
| 131 // Show the bubble. |
| 132 ExtensionMessageBubbleView* bubble_delegate = |
| 133 new ExtensionMessageBubbleView(anchor_view, dev_mode_extensions); |
| 134 views::BubbleDelegateView::CreateBubble(bubble_delegate); |
| 135 dev_mode_extensions->Show(bubble_delegate); |
80 } | 136 } |
81 } | 137 } |
82 | 138 |
83 void SuspiciousExtensionBubbleView::OnButtonClicked( | 139 void ExtensionMessageBubbleView::OnActionButtonClicked( |
84 const base::Closure& callback) { | 140 const base::Closure& callback) { |
85 button_callback_ = callback; | 141 action_callback_ = callback; |
86 } | 142 } |
87 | 143 |
88 void SuspiciousExtensionBubbleView::OnLinkClicked( | 144 void ExtensionMessageBubbleView::OnDismissButtonClicked( |
| 145 const base::Closure& callback) { |
| 146 dismiss_callback_ = callback; |
| 147 } |
| 148 |
| 149 void ExtensionMessageBubbleView::OnLinkClicked( |
89 const base::Closure& callback) { | 150 const base::Closure& callback) { |
90 link_callback_ = callback; | 151 link_callback_ = callback; |
91 } | 152 } |
92 | 153 |
93 void SuspiciousExtensionBubbleView::Show() { | 154 void ExtensionMessageBubbleView::Show() { |
94 // Not showing the bubble right away (during startup) has a few benefits: | 155 // Not showing the bubble right away (during startup) has a few benefits: |
95 // We don't have to worry about focus being lost due to the Omnibox (or to | 156 // We don't have to worry about focus being lost due to the Omnibox (or to |
96 // other things that want focus at startup). This allows Esc to work to close | 157 // other things that want focus at startup). This allows Esc to work to close |
97 // the bubble and also solves the keyboard accessibility problem that comes | 158 // the bubble and also solves the keyboard accessibility problem that comes |
98 // with focus being lost (we don't have a good generic mechanism of injecting | 159 // with focus being lost (we don't have a good generic mechanism of injecting |
99 // bubbles into the focus cycle). Another benefit of delaying the show is | 160 // bubbles into the focus cycle). Another benefit of delaying the show is |
100 // that fade-in works (the fade-in isn't apparent if the the bubble appears at | 161 // that fade-in works (the fade-in isn't apparent if the the bubble appears at |
101 // startup). | 162 // startup). |
102 base::MessageLoop::current()->PostDelayedTask( | 163 base::MessageLoop::current()->PostDelayedTask( |
103 FROM_HERE, | 164 FROM_HERE, |
104 base::Bind(&SuspiciousExtensionBubbleView::ShowBubble, | 165 base::Bind(&ExtensionMessageBubbleView::ShowBubble, |
105 weak_factory_.GetWeakPtr()), | 166 weak_factory_.GetWeakPtr()), |
106 base::TimeDelta::FromSeconds(kBubbleAppearanceWaitTime)); | 167 base::TimeDelta::FromSeconds(kBubbleAppearanceWaitTime)); |
107 } | 168 } |
108 | 169 |
109 void SuspiciousExtensionBubbleView::OnWidgetDestroying(views::Widget* widget) { | 170 void ExtensionMessageBubbleView::OnWidgetDestroying(views::Widget* widget) { |
110 // To catch Esc, we monitor destroy message. Unless the link has been clicked, | 171 // To catch Esc, we monitor destroy message. Unless the link has been clicked, |
111 // we assume Dismiss was the action taken. | 172 // we assume Dismiss was the action taken. |
112 if (!link_clicked_) | 173 if (!link_clicked_ && !action_taken_) |
113 button_callback_.Run(); | 174 dismiss_callback_.Run(); |
114 } | 175 } |
115 | 176 |
116 //////////////////////////////////////////////////////////////////////////////// | 177 //////////////////////////////////////////////////////////////////////////////// |
117 // SuspiciousExtensionBubbleView - private. | 178 // ExtensionMessageBubbleView - private. |
118 | 179 |
119 SuspiciousExtensionBubbleView::~SuspiciousExtensionBubbleView() { | 180 ExtensionMessageBubbleView::~ExtensionMessageBubbleView() { |
120 } | 181 } |
121 | 182 |
122 void SuspiciousExtensionBubbleView::ShowBubble() { | 183 void ExtensionMessageBubbleView::ShowBubble() { |
123 StartFade(true); | 184 StartFade(true); |
124 } | 185 } |
125 | 186 |
126 void SuspiciousExtensionBubbleView::Init() { | 187 void ExtensionMessageBubbleView::Init() { |
127 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); | 188 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); |
128 | 189 |
129 views::GridLayout* layout = views::GridLayout::CreatePanel(this); | 190 views::GridLayout* layout = views::GridLayout::CreatePanel(this); |
130 layout->SetInsets(kInsetTop, kInsetLeft, | 191 layout->SetInsets(kInsetTop, kInsetLeft, |
131 kInsetBottomRight, kInsetBottomRight); | 192 kInsetBottomRight, kInsetBottomRight); |
132 SetLayoutManager(layout); | 193 SetLayoutManager(layout); |
133 | 194 |
134 const int headline_column_set_id = 0; | 195 const int headline_column_set_id = 0; |
135 views::ColumnSet* top_columns = layout->AddColumnSet(headline_column_set_id); | 196 views::ColumnSet* top_columns = layout->AddColumnSet(headline_column_set_id); |
136 top_columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER, | 197 top_columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER, |
137 0, views::GridLayout::USE_PREF, 0, 0); | 198 0, views::GridLayout::USE_PREF, 0, 0); |
138 top_columns->AddPaddingColumn(1, 0); | 199 top_columns->AddPaddingColumn(1, 0); |
139 layout->StartRow(0, headline_column_set_id); | 200 layout->StartRow(0, headline_column_set_id); |
140 | 201 |
141 headline_ = new views::Label(); | 202 headline_ = new views::Label(); |
142 headline_->SetFont(rb.GetFont(ui::ResourceBundle::MediumFont)); | 203 headline_->SetFont(rb.GetFont(ui::ResourceBundle::MediumFont)); |
143 headline_->SetText(controller_->GetTitle()); | 204 headline_->SetText(delegate_->GetTitle()); |
144 layout->AddView(headline_); | 205 layout->AddView(headline_); |
145 | 206 |
146 layout->AddPaddingRow(0, kHeadlineRowPadding); | 207 layout->AddPaddingRow(0, kHeadlineRowPadding); |
147 | 208 |
148 const int text_column_set_id = 1; | 209 const int text_column_set_id = 1; |
149 views::ColumnSet* upper_columns = layout->AddColumnSet(text_column_set_id); | 210 views::ColumnSet* upper_columns = layout->AddColumnSet(text_column_set_id); |
150 upper_columns->AddColumn( | 211 upper_columns->AddColumn( |
151 views::GridLayout::LEADING, views::GridLayout::LEADING, | 212 views::GridLayout::LEADING, views::GridLayout::LEADING, |
152 0, views::GridLayout::USE_PREF, 0, 0); | 213 0, views::GridLayout::USE_PREF, 0, 0); |
153 layout->StartRow(0, text_column_set_id); | 214 layout->StartRow(0, text_column_set_id); |
154 | 215 |
155 views::Label* message = new views::Label(); | 216 views::Label* message = new views::Label(); |
156 message->SetMultiLine(true); | 217 message->SetMultiLine(true); |
157 message->SetHorizontalAlignment(gfx::ALIGN_LEFT); | 218 message->SetHorizontalAlignment(gfx::ALIGN_LEFT); |
158 message->SetText(controller_->GetMessageBody()); | 219 message->SetText(delegate_->GetMessageBody()); |
159 message->SizeToFit(views::Widget::GetLocalizedContentsWidth( | 220 message->SizeToFit(views::Widget::GetLocalizedContentsWidth( |
160 IDS_EXTENSION_WIPEOUT_BUBBLE_WIDTH_CHARS)); | 221 IDS_EXTENSION_WIPEOUT_BUBBLE_WIDTH_CHARS)); |
161 layout->AddView(message); | 222 layout->AddView(message); |
162 | 223 |
163 const int extension_list_column_set_id = 2; | 224 if (delegate_->ShouldShowExtensionList()) { |
164 views::ColumnSet* middle_columns = | 225 const int extension_list_column_set_id = 2; |
165 layout->AddColumnSet(extension_list_column_set_id); | 226 views::ColumnSet* middle_columns = |
166 middle_columns->AddPaddingColumn(0, kExtensionListPadding); | 227 layout->AddColumnSet(extension_list_column_set_id); |
167 middle_columns->AddColumn( | 228 middle_columns->AddPaddingColumn(0, kExtensionListPadding); |
168 views::GridLayout::LEADING, views::GridLayout::CENTER, | 229 middle_columns->AddColumn( |
169 0, views::GridLayout::USE_PREF, 0, 0); | 230 views::GridLayout::LEADING, views::GridLayout::CENTER, |
| 231 0, views::GridLayout::USE_PREF, 0, 0); |
170 | 232 |
171 layout->StartRowWithPadding(0, extension_list_column_set_id, | 233 layout->StartRowWithPadding(0, extension_list_column_set_id, |
172 0, kHeadlineMessagePadding); | 234 0, kHeadlineMessagePadding); |
173 views::Label* extensions = new views::Label(); | 235 views::Label* extensions = new views::Label(); |
174 extensions->SetMultiLine(true); | 236 extensions->SetMultiLine(true); |
175 extensions->SetHorizontalAlignment(gfx::ALIGN_LEFT); | 237 extensions->SetHorizontalAlignment(gfx::ALIGN_LEFT); |
176 | 238 |
177 std::vector<string16> extension_list; | 239 std::vector<string16> extension_list; |
178 char16 bullet_point = 0x2022; | 240 char16 bullet_point = 0x2022; |
179 | 241 |
180 std::vector<string16> suspicious = controller_->GetSuspiciousExtensionNames(); | 242 std::vector<string16> suspicious = delegate_->GetExtensions(); |
181 size_t i = 0; | 243 size_t i = 0; |
182 for (; i < suspicious.size() && i < kMaxExtensionsToShow; ++i) { | 244 for (; i < suspicious.size() && i < kMaxExtensionsToShow; ++i) { |
183 // Add each extension with bullet point. | 245 // Add each extension with bullet point. |
184 extension_list.push_back(bullet_point + ASCIIToUTF16(" ") + suspicious[i]); | 246 extension_list.push_back( |
| 247 bullet_point + ASCIIToUTF16(" ") + suspicious[i]); |
| 248 } |
| 249 |
| 250 if (i > kMaxExtensionsToShow) { |
| 251 string16 difference = base::IntToString16(i - kMaxExtensionsToShow); |
| 252 extension_list.push_back(bullet_point + ASCIIToUTF16(" ") + |
| 253 delegate_->GetOverflowText(difference)); |
| 254 } |
| 255 |
| 256 extensions->SetText(JoinString(extension_list, ASCIIToUTF16("\n"))); |
| 257 extensions->SizeToFit(views::Widget::GetLocalizedContentsWidth( |
| 258 IDS_EXTENSION_WIPEOUT_BUBBLE_WIDTH_CHARS)); |
| 259 layout->AddView(extensions); |
185 } | 260 } |
186 | 261 |
187 if (i > kMaxExtensionsToShow) { | 262 string16 action_button = delegate_->GetActionButtonLabel(); |
188 base::string16 difference = base::IntToString16(i - kMaxExtensionsToShow); | |
189 extension_list.push_back(bullet_point + ASCIIToUTF16(" ") + | |
190 controller_->GetOverflowText(difference)); | |
191 } | |
192 | |
193 extensions->SetText(JoinString(extension_list, ASCIIToUTF16("\n"))); | |
194 extensions->SizeToFit(views::Widget::GetLocalizedContentsWidth( | |
195 IDS_EXTENSION_WIPEOUT_BUBBLE_WIDTH_CHARS)); | |
196 layout->AddView(extensions); | |
197 | 263 |
198 const int action_row_column_set_id = 3; | 264 const int action_row_column_set_id = 3; |
199 views::ColumnSet* bottom_columns = | 265 views::ColumnSet* bottom_columns = |
200 layout->AddColumnSet(action_row_column_set_id); | 266 layout->AddColumnSet(action_row_column_set_id); |
201 bottom_columns->AddColumn(views::GridLayout::LEADING, | 267 bottom_columns->AddColumn(views::GridLayout::LEADING, |
202 views::GridLayout::CENTER, 0, views::GridLayout::USE_PREF, 0, 0); | 268 views::GridLayout::CENTER, 0, views::GridLayout::USE_PREF, 0, 0); |
203 bottom_columns->AddPaddingColumn(1, 0); | 269 bottom_columns->AddPaddingColumn(1, 0); |
204 bottom_columns->AddColumn(views::GridLayout::TRAILING, | 270 bottom_columns->AddColumn(views::GridLayout::TRAILING, |
205 views::GridLayout::CENTER, 0, views::GridLayout::USE_PREF, 0, 0); | 271 views::GridLayout::CENTER, 0, views::GridLayout::USE_PREF, 0, 0); |
| 272 if (!action_button.empty()) { |
| 273 bottom_columns->AddColumn(views::GridLayout::TRAILING, |
| 274 views::GridLayout::CENTER, 0, views::GridLayout::USE_PREF, 0, 0); |
| 275 } |
206 layout->StartRowWithPadding(0, action_row_column_set_id, | 276 layout->StartRowWithPadding(0, action_row_column_set_id, |
207 0, kMessageBubblePadding); | 277 0, kMessageBubblePadding); |
208 | 278 |
209 learn_more_ = new views::Link(controller_->GetLearnMoreLabel()); | 279 learn_more_ = new views::Link(delegate_->GetLearnMoreLabel()); |
210 learn_more_->set_listener(this); | 280 learn_more_->set_listener(this); |
211 layout->AddView(learn_more_); | 281 layout->AddView(learn_more_); |
212 | 282 |
| 283 if (!action_button.empty()) { |
| 284 action_button_ = new views::LabelButton(this, action_button.c_str()); |
| 285 action_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON); |
| 286 layout->AddView(action_button_); |
| 287 } |
| 288 |
213 dismiss_button_ = new views::LabelButton(this, | 289 dismiss_button_ = new views::LabelButton(this, |
214 controller_->GetDismissButtonLabel()); | 290 delegate_->GetDismissButtonLabel()); |
215 dismiss_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON); | 291 dismiss_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON); |
216 layout->AddView(dismiss_button_); | 292 layout->AddView(dismiss_button_); |
217 } | 293 } |
218 | 294 |
219 void SuspiciousExtensionBubbleView::ButtonPressed(views::Button* sender, | 295 void ExtensionMessageBubbleView::ButtonPressed(views::Button* sender, |
220 const ui::Event& event) { | 296 const ui::Event& event) { |
221 DCHECK_EQ(dismiss_button_, sender); | 297 if (sender == action_button_) { |
| 298 action_taken_ = true; |
| 299 action_callback_.Run(); |
| 300 } else { |
| 301 DCHECK_EQ(dismiss_button_, sender); |
| 302 } |
222 GetWidget()->Close(); | 303 GetWidget()->Close(); |
223 } | 304 } |
224 | 305 |
225 void SuspiciousExtensionBubbleView::LinkClicked(views::Link* source, | 306 void ExtensionMessageBubbleView::LinkClicked(views::Link* source, |
226 int event_flags) { | 307 int event_flags) { |
227 DCHECK_EQ(learn_more_, source); | 308 DCHECK_EQ(learn_more_, source); |
228 link_clicked_ = true; | 309 link_clicked_ = true; |
229 link_callback_.Run(); | 310 link_callback_.Run(); |
230 GetWidget()->Close(); | 311 GetWidget()->Close(); |
231 } | 312 } |
232 | 313 |
233 void SuspiciousExtensionBubbleView::GetAccessibleState( | 314 void ExtensionMessageBubbleView::GetAccessibleState( |
234 ui::AccessibleViewState* state) { | 315 ui::AccessibleViewState* state) { |
235 state->role = ui::AccessibilityTypes::ROLE_ALERT; | 316 state->role = ui::AccessibilityTypes::ROLE_ALERT; |
236 } | 317 } |
237 | 318 |
238 void SuspiciousExtensionBubbleView::ViewHierarchyChanged( | 319 void ExtensionMessageBubbleView::ViewHierarchyChanged( |
239 const ViewHierarchyChangedDetails& details) { | 320 const ViewHierarchyChangedDetails& details) { |
240 if (details.is_add && details.child == this) | 321 if (details.is_add && details.child == this) |
241 NotifyAccessibilityEvent(ui::AccessibilityTypes::EVENT_ALERT, true); | 322 NotifyAccessibilityEvent(ui::AccessibilityTypes::EVENT_ALERT, true); |
242 } | 323 } |
243 | 324 |
244 } // namespace extensions | 325 } // namespace extensions |
OLD | NEW |