OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/gtk/accessible_widget_helper_gtk.h" | 5 #include "chrome/browser/gtk/accessible_widget_helper_gtk.h" |
6 | 6 |
7 #include "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
8 #include "chrome/browser/accessibility_events.h" | 8 #include "chrome/browser/accessibility_events.h" |
9 #include "chrome/browser/profile.h" | 9 #include "chrome/browser/profile.h" |
10 #include "chrome/common/notification_service.h" | 10 #include "chrome/common/notification_service.h" |
11 | 11 |
12 AccessibleWidgetHelper::AccessibleWidgetHelper( | 12 AccessibleWidgetHelper::AccessibleWidgetHelper( |
13 GtkWidget* root_widget, Profile* profile) | 13 GtkWidget* root_widget, Profile* profile) |
14 : accessibility_event_router_(AccessibilityEventRouterGtk::GetInstance()), | 14 : accessibility_event_router_(AccessibilityEventRouterGtk::GetInstance()), |
15 profile_(profile), | 15 profile_(profile), |
16 root_widget_(root_widget) { | 16 root_widget_(root_widget) { |
17 accessibility_event_router_->AddRootWidget(root_widget_, profile); | 17 CHECK(profile_); |
| 18 accessibility_event_router_->AddRootWidget(root_widget_, profile_); |
18 } | 19 } |
19 | 20 |
20 AccessibleWidgetHelper::~AccessibleWidgetHelper() { | 21 AccessibleWidgetHelper::~AccessibleWidgetHelper() { |
21 if (!window_title_.empty()) { | 22 if (!window_title_.empty()) { |
22 AccessibilityWindowInfo info(profile_, window_title_); | 23 AccessibilityWindowInfo info(profile_, window_title_); |
23 NotificationService::current()->Notify( | 24 NotificationService::current()->Notify( |
24 NotificationType::ACCESSIBILITY_WINDOW_CLOSED, | 25 NotificationType::ACCESSIBILITY_WINDOW_CLOSED, |
25 Source<Profile>(profile_), | 26 Source<Profile>(profile_), |
26 Details<AccessibilityWindowInfo>(&info)); | 27 Details<AccessibilityWindowInfo>(&info)); |
27 } | 28 } |
(...skipping 25 matching lines...) Expand all Loading... |
53 accessibility_event_router_->SetWidgetName(widget, name); | 54 accessibility_event_router_->SetWidgetName(widget, name); |
54 managed_widgets_.push_back(widget); | 55 managed_widgets_.push_back(widget); |
55 } | 56 } |
56 | 57 |
57 void AccessibleWidgetHelper::SetWidgetName( | 58 void AccessibleWidgetHelper::SetWidgetName( |
58 GtkWidget* widget, int string_id) { | 59 GtkWidget* widget, int string_id) { |
59 std::string name = l10n_util::GetStringUTF8(string_id); | 60 std::string name = l10n_util::GetStringUTF8(string_id); |
60 accessibility_event_router_->SetWidgetName(widget, name); | 61 accessibility_event_router_->SetWidgetName(widget, name); |
61 managed_widgets_.push_back(widget); | 62 managed_widgets_.push_back(widget); |
62 } | 63 } |
OLD | NEW |