| 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/tab_contents/native_tab_contents_view_aura.h" | 5 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.h" |
| 6 | 6 |
| 7 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view_delegate
.h" | 7 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view_delegate
.h" |
| 8 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view_views.h" | 8 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view_views.h" |
| 9 #include "content/browser/renderer_host/render_widget_host_view_aura.h" | 9 #include "content/browser/renderer_host/render_widget_host_view_aura.h" |
| 10 #include "content/browser/tab_contents/tab_contents.h" | 10 #include "content/browser/tab_contents/tab_contents.h" |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 } | 56 } |
| 57 | 57 |
| 58 void NativeTabContentsViewAura::Unparent() { | 58 void NativeTabContentsViewAura::Unparent() { |
| 59 // Nothing to do. | 59 // Nothing to do. |
| 60 } | 60 } |
| 61 | 61 |
| 62 RenderWidgetHostView* NativeTabContentsViewAura::CreateRenderWidgetHostView( | 62 RenderWidgetHostView* NativeTabContentsViewAura::CreateRenderWidgetHostView( |
| 63 RenderWidgetHost* render_widget_host) { | 63 RenderWidgetHost* render_widget_host) { |
| 64 RenderWidgetHostViewAura* view = | 64 RenderWidgetHostViewAura* view = |
| 65 new RenderWidgetHostViewAura(render_widget_host); | 65 new RenderWidgetHostViewAura(render_widget_host); |
| 66 view->Init(); | 66 view->InitAsChild(); |
| 67 GetNativeView()->AddChild(view->GetNativeView()); | 67 GetNativeView()->AddChild(view->GetNativeView()); |
| 68 view->Show(); | 68 view->Show(); |
| 69 return view; | 69 return view; |
| 70 } | 70 } |
| 71 | 71 |
| 72 gfx::NativeWindow NativeTabContentsViewAura::GetTopLevelNativeWindow() const { | 72 gfx::NativeWindow NativeTabContentsViewAura::GetTopLevelNativeWindow() const { |
| 73 // TODO(beng): | 73 // TODO(beng): |
| 74 NOTIMPLEMENTED(); | 74 NOTIMPLEMENTED(); |
| 75 return NULL; | 75 return NULL; |
| 76 } | 76 } |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 // NativeTabContentsView, public: | 141 // NativeTabContentsView, public: |
| 142 | 142 |
| 143 // static | 143 // static |
| 144 NativeTabContentsView* NativeTabContentsView::CreateNativeTabContentsView( | 144 NativeTabContentsView* NativeTabContentsView::CreateNativeTabContentsView( |
| 145 internal::NativeTabContentsViewDelegate* delegate) { | 145 internal::NativeTabContentsViewDelegate* delegate) { |
| 146 // return new NativeTabContentsViewViews(delegate); | 146 // return new NativeTabContentsViewViews(delegate); |
| 147 // TODO(beng): switch over to this. | 147 // TODO(beng): switch over to this. |
| 148 return new NativeTabContentsViewAura(delegate); | 148 return new NativeTabContentsViewAura(delegate); |
| 149 } | 149 } |
| 150 #endif | 150 #endif |
| OLD | NEW |