1 files changed, 9 insertions, 7 deletions
diff --git a/chromium/ui/views/widget/widget_delegate.cc b/chromium/ui/views/widget/widget_delegate.cc
index fbace27c316..7e1f67e19c3 100644
--- a/chromium/ui/views/widget/widget_delegate.cc
+++ b/chromium/ui/views/widget/widget_delegate.cc
@@ -17,7 +17,9 @@ namespace views {
 ////////////////////////////////////////////////////////////////////////////////
 // WidgetDelegate:
 
-WidgetDelegate::WidgetDelegate() : default_contents_view_(NULL) {
+WidgetDelegate::WidgetDelegate()
+    : default_contents_view_(NULL),
+      can_activate_(true) {
 }
 
 void WidgetDelegate::OnWidgetMove() {
@@ -50,23 +52,23 @@ bool WidgetDelegate::CanMaximize() const {
 }
 
 bool WidgetDelegate::CanActivate() const {
-  return true;
+  return can_activate_;
 }
 
 ui::ModalType WidgetDelegate::GetModalType() const {
   return ui::MODAL_TYPE_NONE;
 }
 
-ui::AccessibilityTypes::Role WidgetDelegate::GetAccessibleWindowRole() const {
-  return ui::AccessibilityTypes::ROLE_WINDOW;
+ui::AXRole WidgetDelegate::GetAccessibleWindowRole() const {
+  return ui::AX_ROLE_WINDOW;
 }
 
-string16 WidgetDelegate::GetAccessibleWindowTitle() const {
+base::string16 WidgetDelegate::GetAccessibleWindowTitle() const {
   return GetWindowTitle();
 }
 
-string16 WidgetDelegate::GetWindowTitle() const {
-  return string16();
+base::string16 WidgetDelegate::GetWindowTitle() const {
+  return base::string16();
 }
 
 bool WidgetDelegate::ShouldShowWindowTitle() const {