OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/infobars/infobar_view.h" | 5 #include "chrome/browser/ui/views/infobars/infobar_view.h" |
6 | 6 |
7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
8 #include <shellapi.h> | 8 #include <shellapi.h> |
9 #endif | 9 #endif |
10 | 10 |
11 #include <algorithm> | 11 #include <algorithm> |
12 | 12 |
13 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
14 #include "base/strings/utf_string_conversions.h" | 14 #include "base/strings/utf_string_conversions.h" |
15 #include "chrome/browser/infobars/infobar_delegate.h" | |
16 #include "chrome/browser/ui/views/infobars/infobar_background.h" | 15 #include "chrome/browser/ui/views/infobars/infobar_background.h" |
| 16 #include "components/infobars/core/infobar_delegate.h" |
17 #include "grit/generated_resources.h" | 17 #include "grit/generated_resources.h" |
18 #include "grit/theme_resources.h" | 18 #include "grit/theme_resources.h" |
19 #include "grit/ui_resources.h" | 19 #include "grit/ui_resources.h" |
20 #include "third_party/skia/include/effects/SkGradientShader.h" | 20 #include "third_party/skia/include/effects/SkGradientShader.h" |
21 #include "ui/accessibility/ax_view_state.h" | 21 #include "ui/accessibility/ax_view_state.h" |
22 #include "ui/base/l10n/l10n_util.h" | 22 #include "ui/base/l10n/l10n_util.h" |
23 #include "ui/base/resource/resource_bundle.h" | 23 #include "ui/base/resource/resource_bundle.h" |
24 #include "ui/gfx/canvas.h" | 24 #include "ui/gfx/canvas.h" |
25 #include "ui/gfx/image/image.h" | 25 #include "ui/gfx/image/image.h" |
26 #include "ui/views/controls/button/image_button.h" | 26 #include "ui/views/controls/button/image_button.h" |
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
442 void InfoBarView::OnWillChangeFocus(View* focused_before, View* focused_now) { | 442 void InfoBarView::OnWillChangeFocus(View* focused_before, View* focused_now) { |
443 views::ExternalFocusTracker::OnWillChangeFocus(focused_before, focused_now); | 443 views::ExternalFocusTracker::OnWillChangeFocus(focused_before, focused_now); |
444 | 444 |
445 // This will trigger some screen readers to read the entire contents of this | 445 // This will trigger some screen readers to read the entire contents of this |
446 // infobar. | 446 // infobar. |
447 if (focused_before && focused_now && !Contains(focused_before) && | 447 if (focused_before && focused_now && !Contains(focused_before) && |
448 Contains(focused_now)) { | 448 Contains(focused_now)) { |
449 NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true); | 449 NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true); |
450 } | 450 } |
451 } | 451 } |
OLD | NEW |