Improvements to accessibility extension api support for "views":...

chrome/browser/chromeos/options/options_window_view.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/options_window.h"
 
 #include "app/l10n_util.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/chromeos/options/internet_page_view.h"
 #include "chrome/browser/chromeos/options/system_page_view.h"
 #include "chrome/browser/gtk/options/advanced_page_gtk.h"
 #include "chrome/browser/gtk/options/content_page_gtk.h"
 #include "chrome/browser/gtk/options/general_page_gtk.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
+#include "chrome/browser/views/accessible_view_helper.h"
 #include "chrome/browser/window_sizer.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/pref_names.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/controls/tabbed_pane/native_tabbed_pane_gtk.h"
 #include "views/controls/tabbed_pane/tabbed_pane.h"
 #include "views/widget/root_view.h"
@@ skipping 106 matching lines @@
   Profile* profile_;
 
   // Native Gtk options pages.
   GeneralPageGtk general_page_;
   ContentPageGtk content_page_;
   AdvancedPageGtk advanced_page_;
 
   // The last page the user was on when they opened the Options window.
   IntegerPrefMember last_selected_page_;
 
+  scoped_ptr<AccessibleViewHelper> accessible_view_helper_;
+
   DISALLOW_IMPLICIT_CONSTRUCTORS(OptionsWindowView);
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 // OptionsWindowView, public:
 
 // No dialog padding.
 const int OptionsWindowView::kDialogPadding = 0;
 
 // Shaded frame color that matches the rendered frame. It's the result
@@ skipping 90 matching lines @@
   last_selected_page_.SetValue(index);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // OptionsWindowView, views::View overrides:
 
 void OptionsWindowView::Layout() {
   tabs_->SetBounds(kDialogPadding, kDialogPadding,
                    width() - (2 * kDialogPadding),
                    height() - (2 * kDialogPadding));
+  if (!accessible_view_helper_.get()) {
+    accessible_view_helper_.reset(new AccessibleViewHelper(this, profile_));
+  }
 }
 
 gfx::Size OptionsWindowView::GetPreferredSize() {
   gfx::Size size(tabs_->GetPreferredSize());
   size.Enlarge(2 * kDialogPadding, 2 * kDialogPadding);
   return size;
 }
 
 void OptionsWindowView::ViewHierarchyChanged(bool is_add,
                                              views::View* parent,
@@ skipping 107 matching lines @@
   // a new one for the current active browser.
   chromeos::CloseOptionsWindow();
 
   OptionsWindowView::instance_ = new OptionsWindowView(profile);
   views::Window::CreateChromeWindow(chromeos::GetOptionsViewParent(),
                                     gfx::Rect(),
                                     OptionsWindowView::instance_);
 
   OptionsWindowView::instance_->ShowOptionsPage(page, highlight_group);
 }