diff options
author | laforge@chromium.org <laforge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-11 22:05:29 +0000 |
---|---|---|
committer | laforge@chromium.org <laforge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-11 22:05:29 +0000 |
commit | 4b16984f3de05637aa1081a83375971243d66110 (patch) | |
tree | ecd275f87f980144ec340ca8fbc95d47a8e6f6e5 | |
parent | 25c68c8cd4d49b97a85463d09d12d19c27d5058c (diff) | |
download | chromium_src-4b16984f3de05637aa1081a83375971243d66110.zip chromium_src-4b16984f3de05637aa1081a83375971243d66110.tar.gz chromium_src-4b16984f3de05637aa1081a83375971243d66110.tar.bz2 |
Fix compile errors by reverting to older variant of the ViewHierarchyChanged method.
Review URL: https://codereview.chromium.org/16225008
git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@205648 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/browser/ui/views/conflicting_module_view_win.cc | 7 | ||||
-rw-r--r-- | chrome/browser/ui/views/conflicting_module_view_win.h | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/chrome/browser/ui/views/conflicting_module_view_win.cc b/chrome/browser/ui/views/conflicting_module_view_win.cc index f45b876..1b4c7ed 100644 --- a/chrome/browser/ui/views/conflicting_module_view_win.cc +++ b/chrome/browser/ui/views/conflicting_module_view_win.cc @@ -208,9 +208,10 @@ void ConflictingModuleView::GetAccessibleState( state->role = ui::AccessibilityTypes::ROLE_ALERT;
}
-void ConflictingModuleView::ViewHierarchyChanged(
- const ViewHierarchyChangedDetails& details) {
- if (details.is_add && details.child == this)
+void ConflictingModuleView::ViewHierarchyChanged(bool is_add,
+ views::View* parent,
+ views::View* child) {
+ if (is_add && child == this)
NotifyAccessibilityEvent(ui::AccessibilityTypes::EVENT_ALERT, true);
}
diff --git a/chrome/browser/ui/views/conflicting_module_view_win.h b/chrome/browser/ui/views/conflicting_module_view_win.h index f525307..d2f6ea3 100644 --- a/chrome/browser/ui/views/conflicting_module_view_win.h +++ b/chrome/browser/ui/views/conflicting_module_view_win.h @@ -50,8 +50,9 @@ class ConflictingModuleView : public views::BubbleDelegateView, // views::View implementation.
virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
- virtual void ViewHierarchyChanged(
- const ViewHierarchyChangedDetails& details) OVERRIDE;
+ virtual void ViewHierarchyChanged(bool is_add,
+ views::View* parent,
+ views::View* child) OVERRIDE;
// content::NotificationObserver implementation.
virtual void Observe(
|