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_container_win
.h" | 5 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_container_win
.h" |
6 | 6 |
7 #include "chrome/browser/renderer_host/render_widget_host_view_win.h" | 7 #include "chrome/browser/renderer_host/render_widget_host_view_win.h" |
8 #include "chrome/browser/ui/view_ids.h" | 8 #include "chrome/browser/ui/view_ids.h" |
9 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_container_vie
ws.h" | 9 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_container_vie
ws.h" |
10 #include "chrome/browser/ui/views/tab_contents/tab_contents_container.h" | 10 #include "chrome/browser/ui/views/tab_contents/tab_contents_container.h" |
11 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h" | 11 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h" |
12 #include "content/browser/renderer_host/render_widget_host_view.h" | 12 #include "content/browser/renderer_host/render_widget_host_view.h" |
13 #include "content/browser/tab_contents/interstitial_page.h" | 13 #include "content/browser/tab_contents/interstitial_page.h" |
14 #include "content/browser/tab_contents/tab_contents.h" | 14 #include "content/browser/tab_contents/tab_contents.h" |
15 #include "ui/base/accessibility/accessible_view_state.h" | 15 #include "ui/base/accessibility/accessible_view_state.h" |
| 16 #include "views/views_delegate.h" |
16 #include "views/focus/focus_manager.h" | 17 #include "views/focus/focus_manager.h" |
17 | 18 |
18 //////////////////////////////////////////////////////////////////////////////// | 19 //////////////////////////////////////////////////////////////////////////////// |
19 // NativeTabContentsContainerWin, public: | 20 // NativeTabContentsContainerWin, public: |
20 | 21 |
21 NativeTabContentsContainerWin::NativeTabContentsContainerWin( | 22 NativeTabContentsContainerWin::NativeTabContentsContainerWin( |
22 TabContentsContainer* container) | 23 TabContentsContainer* container) |
23 : container_(container) { | 24 : container_(container) { |
24 set_id(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW); | 25 set_id(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW); |
25 } | 26 } |
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
150 | 151 |
151 return View::GetNativeViewAccessible(); | 152 return View::GetNativeViewAccessible(); |
152 } | 153 } |
153 | 154 |
154 //////////////////////////////////////////////////////////////////////////////// | 155 //////////////////////////////////////////////////////////////////////////////// |
155 // NativeTabContentsContainer, public: | 156 // NativeTabContentsContainer, public: |
156 | 157 |
157 // static | 158 // static |
158 NativeTabContentsContainer* NativeTabContentsContainer::CreateNativeContainer( | 159 NativeTabContentsContainer* NativeTabContentsContainer::CreateNativeContainer( |
159 TabContentsContainer* container) { | 160 TabContentsContainer* container) { |
160 if (views::Widget::IsPureViews()) | 161 if (views::Widget::IsPureViews() && |
| 162 views::ViewsDelegate::views_delegate->GetDefaultParentView()) |
161 return new NativeTabContentsContainerViews(container); | 163 return new NativeTabContentsContainerViews(container); |
162 return new NativeTabContentsContainerWin(container); | 164 return new NativeTabContentsContainerWin(container); |
163 } | 165 } |
OLD | NEW |