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_gtk
.h" | 5 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk
.h" |
6 | 6 |
7 #include "chrome/browser/ui/view_ids.h" | 7 #include "chrome/browser/ui/view_ids.h" |
8 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_container_vie
ws.h" | 8 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_container_vie
ws.h" |
9 #include "chrome/browser/ui/views/tab_contents/tab_contents_container.h" | 9 #include "chrome/browser/ui/views/tab_contents/tab_contents_container.h" |
10 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h" | 10 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h" |
11 #include "content/browser/renderer_host/render_widget_host_view.h" | 11 #include "content/browser/renderer_host/render_widget_host_view.h" |
12 #include "content/browser/tab_contents/interstitial_page.h" | 12 #include "content/browser/tab_contents/interstitial_page.h" |
13 #include "content/browser/tab_contents/tab_contents.h" | 13 #include "content/browser/tab_contents/tab_contents.h" |
14 #include "ui/base/accessibility/accessible_view_state.h" | 14 #include "ui/base/accessibility/accessible_view_state.h" |
15 #include "views/focus/focus_manager.h" | 15 #include "views/focus/focus_manager.h" |
| 16 #include "views/views_delegate.h" |
16 | 17 |
17 //////////////////////////////////////////////////////////////////////////////// | 18 //////////////////////////////////////////////////////////////////////////////// |
18 // NativeTabContentsContainerGtk, public: | 19 // NativeTabContentsContainerGtk, public: |
19 | 20 |
20 NativeTabContentsContainerGtk::NativeTabContentsContainerGtk( | 21 NativeTabContentsContainerGtk::NativeTabContentsContainerGtk( |
21 TabContentsContainer* container) | 22 TabContentsContainer* container) |
22 : container_(container), | 23 : container_(container), |
23 focus_callback_id_(0) { | 24 focus_callback_id_(0) { |
24 set_id(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW); | 25 set_id(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW); |
25 } | 26 } |
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
139 ui::AccessibleViewState* state) { | 140 ui::AccessibleViewState* state) { |
140 state->role = ui::AccessibilityTypes::ROLE_GROUPING; | 141 state->role = ui::AccessibilityTypes::ROLE_GROUPING; |
141 } | 142 } |
142 | 143 |
143 //////////////////////////////////////////////////////////////////////////////// | 144 //////////////////////////////////////////////////////////////////////////////// |
144 // NativeTabContentsContainer, public: | 145 // NativeTabContentsContainer, public: |
145 | 146 |
146 // static | 147 // static |
147 NativeTabContentsContainer* NativeTabContentsContainer::CreateNativeContainer( | 148 NativeTabContentsContainer* NativeTabContentsContainer::CreateNativeContainer( |
148 TabContentsContainer* container) { | 149 TabContentsContainer* container) { |
149 if (views::Widget::IsPureViews()) | 150 if (views::Widget::IsPureViews() && |
| 151 views::ViewsDelegate::views_delegate->GetDefaultParentView()) |
150 return new NativeTabContentsContainerViews(container); | 152 return new NativeTabContentsContainerViews(container); |
151 return new NativeTabContentsContainerGtk(container); | 153 return new NativeTabContentsContainerGtk(container); |
152 } | 154 } |
OLD | NEW |