| 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_gtk.h" | 5 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view_gtk.h" |
| 6 | 6 |
| 7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
| 8 #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h" | 8 #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h" |
| 9 #include "chrome/browser/tab_contents/web_drag_dest_gtk.h" | 9 #include "chrome/browser/tab_contents/web_drag_dest_gtk.h" |
| 10 #include "chrome/browser/ui/gtk/constrained_window_gtk.h" | 10 #include "chrome/browser/ui/gtk/constrained_window_gtk.h" |
| 11 #include "chrome/browser/ui/gtk/tab_contents_drag_source.h" | 11 #include "chrome/browser/ui/gtk/tab_contents_drag_source.h" |
| 12 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view_delegate
.h" | 12 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view_delegate
.h" |
| 13 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view_views.h" | 13 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view_views.h" |
| 14 #include "content/browser/tab_contents/tab_contents.h" | 14 #include "content/browser/tab_contents/tab_contents.h" |
| 15 #include "content/browser/tab_contents/tab_contents_view.h" | 15 #include "content/browser/tab_contents/tab_contents_view.h" |
| 16 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDragData.h" | 16 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDragData.h" |
| 17 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" | 17 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" |
| 18 #include "views/views_delegate.h" |
| 18 | 19 |
| 19 using WebKit::WebDragOperation; | 20 using WebKit::WebDragOperation; |
| 20 using WebKit::WebDragOperationsMask; | 21 using WebKit::WebDragOperationsMask; |
| 21 using WebKit::WebInputEvent; | 22 using WebKit::WebInputEvent; |
| 22 | 23 |
| 23 namespace { | 24 namespace { |
| 24 | 25 |
| 25 // Called when the content view gtk widget is tabbed to, or after the call to | 26 // Called when the content view gtk widget is tabbed to, or after the call to |
| 26 // gtk_widget_child_focus() in TakeFocus(). We return true | 27 // gtk_widget_child_focus() in TakeFocus(). We return true |
| 27 // and grab focus if we don't have it. The call to | 28 // and grab focus if we don't have it. The call to |
| (...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 254 PositionChild(widget, child_x, 0, 0, 0); | 255 PositionChild(widget, child_x, 0, 0, 0); |
| 255 } | 256 } |
| 256 } | 257 } |
| 257 | 258 |
| 258 //////////////////////////////////////////////////////////////////////////////// | 259 //////////////////////////////////////////////////////////////////////////////// |
| 259 // NativeTabContentsView, public: | 260 // NativeTabContentsView, public: |
| 260 | 261 |
| 261 // static | 262 // static |
| 262 NativeTabContentsView* NativeTabContentsView::CreateNativeTabContentsView( | 263 NativeTabContentsView* NativeTabContentsView::CreateNativeTabContentsView( |
| 263 internal::NativeTabContentsViewDelegate* delegate) { | 264 internal::NativeTabContentsViewDelegate* delegate) { |
| 264 if (views::Widget::IsPureViews()) | 265 if (views::Widget::IsPureViews() && |
| 266 views::ViewsDelegate::views_delegate->GetDefaultParentView()) |
| 265 return new NativeTabContentsViewViews(delegate); | 267 return new NativeTabContentsViewViews(delegate); |
| 266 return new NativeTabContentsViewGtk(delegate); | 268 return new NativeTabContentsViewGtk(delegate); |
| 267 } | 269 } |
| 268 | |
| OLD | NEW |