1 files changed, 11 insertions, 4 deletions
diff --git a/chromium/ui/views/widget/widget_delegate.h b/chromium/ui/views/widget/widget_delegate.h
index 16e29a8b338..b9903096c14 100644
--- a/chromium/ui/views/widget/widget_delegate.h
+++ b/chromium/ui/views/widget/widget_delegate.h
@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#include "ui/base/accessibility/accessibility_types.h"
+#include "ui/accessibility/ax_enums.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/views/view.h"
 
@@ -30,6 +30,11 @@ class VIEWS_EXPORT WidgetDelegate {
  public:
   WidgetDelegate();
 
+  // Sets the return value of CanActivate(). Default is true.
+  void set_can_activate(bool can_activate) {
+    can_activate_ = can_activate;
+  }
+
   // Called whenever the widget's position changes.
   virtual void OnWidgetMove();
 
@@ -60,13 +65,13 @@ class VIEWS_EXPORT WidgetDelegate {
   // ui::MODAL_TYPE_NONE (not modal).
   virtual ui::ModalType GetModalType() const;
 
-  virtual ui::AccessibilityTypes::Role GetAccessibleWindowRole() const;
+  virtual ui::AXRole GetAccessibleWindowRole() const;
 
   // Returns the title to be read with screen readers.
-  virtual string16 GetAccessibleWindowTitle() const;
+  virtual base::string16 GetAccessibleWindowTitle() const;
 
   // Returns the text to be displayed in the window title.
-  virtual string16 GetWindowTitle() const;
+  virtual base::string16 GetWindowTitle() const;
 
   // Returns true if the window should show a title in the title bar.
   virtual bool ShouldShowWindowTitle() const;
@@ -181,6 +186,8 @@ class VIEWS_EXPORT WidgetDelegate {
  private:
   View* default_contents_view_;
 
+  bool can_activate_;
+
   DISALLOW_COPY_AND_ASSIGN(WidgetDelegate);
 };