| OLD | NEW |
| 1 // Copyright (c) 2006-2008 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/views/dom_view.h" | 5 #include "chrome/browser/ui/views/dom_view.h" |
| 6 | 6 |
| 7 #include "chrome/browser/tab_contents/tab_contents.h" | 7 #include "chrome/browser/tab_contents/tab_contents.h" |
| 8 #include "ipc/ipc_message.h" | 8 #include "ipc/ipc_message.h" |
| 9 #include "views/focus/focus_manager.h" | 9 #include "views/focus/focus_manager.h" |
| 10 | 10 |
| 11 #if defined(TOUCH_UI) | 11 #if defined(TOUCH_UI) |
| 12 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h" | 12 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h" |
| 13 #endif | 13 #endif |
| 14 | 14 |
| 15 DOMView::DOMView() : tab_contents_(NULL), initialized_(false) { | 15 DOMView::DOMView() : tab_contents_(NULL), initialized_(false) { |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 Detach(); | 65 Detach(); |
| 66 } | 66 } |
| 67 | 67 |
| 68 void DOMView::AttachTabContents() { | 68 void DOMView::AttachTabContents() { |
| 69 #if defined(TOUCH_UI) | 69 #if defined(TOUCH_UI) |
| 70 AttachToView(static_cast<TabContentsViewViews*>(tab_contents_->view())); | 70 AttachToView(static_cast<TabContentsViewViews*>(tab_contents_->view())); |
| 71 #else | 71 #else |
| 72 Attach(tab_contents_->GetNativeView()); | 72 Attach(tab_contents_->GetNativeView()); |
| 73 #endif | 73 #endif |
| 74 } | 74 } |
| OLD | NEW |