| 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" |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 internal::NativeTabContentsViewDelegate* delegate) | 68 internal::NativeTabContentsViewDelegate* delegate) |
| 69 : views::NativeWidgetGtk(delegate->AsNativeWidgetDelegate()), | 69 : views::NativeWidgetGtk(delegate->AsNativeWidgetDelegate()), |
| 70 delegate_(delegate), | 70 delegate_(delegate), |
| 71 ignore_next_char_event_(false), | 71 ignore_next_char_event_(false), |
| 72 ALLOW_THIS_IN_INITIALIZER_LIST(drag_source_( | 72 ALLOW_THIS_IN_INITIALIZER_LIST(drag_source_( |
| 73 new TabContentsDragSource(delegate->GetTabContents()->view()))) { | 73 new TabContentsDragSource(delegate->GetTabContents()->view()))) { |
| 74 } | 74 } |
| 75 | 75 |
| 76 NativeTabContentsViewGtk::~NativeTabContentsViewGtk() { | 76 NativeTabContentsViewGtk::~NativeTabContentsViewGtk() { |
| 77 delegate_ = NULL; | 77 delegate_ = NULL; |
| 78 CloseNow(); | |
| 79 } | 78 } |
| 80 | 79 |
| 81 void NativeTabContentsViewGtk::AttachConstrainedWindow( | 80 void NativeTabContentsViewGtk::AttachConstrainedWindow( |
| 82 ConstrainedWindowGtk* constrained_window) { | 81 ConstrainedWindowGtk* constrained_window) { |
| 83 DCHECK(find(constrained_windows_.begin(), constrained_windows_.end(), | 82 DCHECK(find(constrained_windows_.begin(), constrained_windows_.end(), |
| 84 constrained_window) == constrained_windows_.end()); | 83 constrained_window) == constrained_windows_.end()); |
| 85 | 84 |
| 86 constrained_windows_.push_back(constrained_window); | 85 constrained_windows_.push_back(constrained_window); |
| 87 AddChild(constrained_window->widget()); | 86 AddChild(constrained_window->widget()); |
| 88 | 87 |
| (...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 260 // NativeTabContentsView, public: | 259 // NativeTabContentsView, public: |
| 261 | 260 |
| 262 // static | 261 // static |
| 263 NativeTabContentsView* NativeTabContentsView::CreateNativeTabContentsView( | 262 NativeTabContentsView* NativeTabContentsView::CreateNativeTabContentsView( |
| 264 internal::NativeTabContentsViewDelegate* delegate) { | 263 internal::NativeTabContentsViewDelegate* delegate) { |
| 265 if (views::Widget::IsPureViews()) | 264 if (views::Widget::IsPureViews()) |
| 266 return new NativeTabContentsViewViews(delegate); | 265 return new NativeTabContentsViewViews(delegate); |
| 267 return new NativeTabContentsViewGtk(delegate); | 266 return new NativeTabContentsViewGtk(delegate); |
| 268 } | 267 } |
| 269 | 268 |
| OLD | NEW |