| Index: chrome/browser/ui/ash/accessibility/ax_root_obj_wrapper.cc
|
| diff --git a/chrome/browser/ui/ash/accessibility/ax_root_obj_wrapper.cc b/chrome/browser/ui/ash/accessibility/ax_root_obj_wrapper.cc
|
| index 1448a211f2ca9a52ce8501b129b0719a66dec9c3..0a2246aa8e66c5897a2cdd1204bb502ac8f9c64f 100644
|
| --- a/chrome/browser/ui/ash/accessibility/ax_root_obj_wrapper.cc
|
| +++ b/chrome/browser/ui/ash/accessibility/ax_root_obj_wrapper.cc
|
| @@ -5,37 +5,15 @@
|
| #include "chrome/browser/ui/ash/accessibility/ax_root_obj_wrapper.h"
|
|
|
| #include "ash/shell.h"
|
| -#include "base/strings/utf_string_conversions.h"
|
| #include "ui/accessibility/ax_node_data.h"
|
| #include "ui/accessibility/ax_view_state.h"
|
| #include "ui/aura/window.h"
|
| #include "ui/views/accessibility/ax_aura_obj_cache.h"
|
|
|
| -namespace {
|
| -class AlertWindow : public aura::Window {
|
| - public:
|
| - AlertWindow() : aura::Window(NULL) {}
|
| - virtual ~AlertWindow() {}
|
| -};
|
| -
|
| -} // namespace
|
| -
|
| -AXRootObjWrapper::AXRootObjWrapper(int32 id)
|
| - : id_(id), alert_window_(new AlertWindow()) {
|
| +AXRootObjWrapper::AXRootObjWrapper(int32 id) : id_(id) {
|
| }
|
|
|
| -AXRootObjWrapper::~AXRootObjWrapper() {
|
| - if (alert_window_) {
|
| - delete alert_window_;
|
| - alert_window_ = NULL;
|
| - }
|
| -}
|
| -
|
| -views::AXAuraObjWrapper* AXRootObjWrapper::GetAlertForText(
|
| - const std::string& text) {
|
| - alert_window_->SetTitle(base::UTF8ToUTF16((text)));
|
| - return views::AXAuraObjCache::GetInstance()->GetOrCreate(alert_window_);
|
| -}
|
| +AXRootObjWrapper::~AXRootObjWrapper() {}
|
|
|
| bool AXRootObjWrapper::HasChild(views::AXAuraObjWrapper* child) {
|
| std::vector<views::AXAuraObjWrapper*> children;
|
| @@ -59,9 +37,6 @@
|
| out_children->push_back(
|
| views::AXAuraObjCache::GetInstance()->GetOrCreate(children[i]));
|
| }
|
| -
|
| - out_children->push_back(
|
| - views::AXAuraObjCache::GetInstance()->GetOrCreate(alert_window_));
|
| }
|
|
|
| void AXRootObjWrapper::Serialize(ui::AXNodeData* out_node_data) {
|
|
|