| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/ui/views/dom_view.h" | 5 #include "chrome/browser/ui/views/dom_view.h" |
| 6 | 6 |
| 7 #include "chrome/browser/profiles/profile.h" | 7 #include "chrome/browser/profiles/profile.h" |
| 8 #include "chrome/browser/renderer_preferences_util.h" | 8 #include "chrome/browser/renderer_preferences_util.h" |
| 9 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h" | 9 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h" |
| 10 #include "content/browser/tab_contents/tab_contents.h" | 10 #include "content/browser/tab_contents/tab_contents.h" |
| 11 #include "views/focus/focus_manager.h" | 11 #include "ui/views/focus/focus_manager.h" |
| 12 #include "views/widget/native_widget_views.h" | 12 #include "views/widget/native_widget_views.h" |
| 13 | 13 |
| 14 // static | 14 // static |
| 15 const char DOMView::kViewClassName[] = | 15 const char DOMView::kViewClassName[] = |
| 16 "browser/ui/views/DOMView"; | 16 "browser/ui/views/DOMView"; |
| 17 | 17 |
| 18 DOMView::DOMView() : initialized_(false) { | 18 DOMView::DOMView() : initialized_(false) { |
| 19 set_focusable(true); | 19 set_focusable(true); |
| 20 } | 20 } |
| 21 | 21 |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 views::NativeWidgetViews* nwv = | 87 views::NativeWidgetViews* nwv = |
| 88 static_cast<views::NativeWidgetViews*>(widget->native_widget()); | 88 static_cast<views::NativeWidgetViews*>(widget->native_widget()); |
| 89 AttachToView(nwv->GetView()); | 89 AttachToView(nwv->GetView()); |
| 90 } else { | 90 } else { |
| 91 #endif | 91 #endif |
| 92 Attach(dom_contents_->tab_contents()->GetNativeView()); | 92 Attach(dom_contents_->tab_contents()->GetNativeView()); |
| 93 #if !defined(USE_AURA) | 93 #if !defined(USE_AURA) |
| 94 } | 94 } |
| 95 #endif | 95 #endif |
| 96 } | 96 } |
| OLD | NEW |