Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(33)

Side by Side Diff: chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.cc

Issue 7313027: Fix crashes in EnterpriseEnrollmentScreenTest.TestCancel. This is independent of any tfarina-indu... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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_win.h" 5 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view_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/tab_contents/web_drop_target_win.h" 8 #include "chrome/browser/tab_contents/web_drop_target_win.h"
9 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view_delegate .h" 9 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view_delegate .h"
10 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view_views.h" 10 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view_views.h"
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 //////////////////////////////////////////////////////////////////////////////// 75 ////////////////////////////////////////////////////////////////////////////////
76 // NativeTabContentsViewWin, public: 76 // NativeTabContentsViewWin, public:
77 77
78 NativeTabContentsViewWin::NativeTabContentsViewWin( 78 NativeTabContentsViewWin::NativeTabContentsViewWin(
79 internal::NativeTabContentsViewDelegate* delegate) 79 internal::NativeTabContentsViewDelegate* delegate)
80 : views::NativeWidgetWin(delegate->AsNativeWidgetDelegate()), 80 : views::NativeWidgetWin(delegate->AsNativeWidgetDelegate()),
81 delegate_(delegate) { 81 delegate_(delegate) {
82 } 82 }
83 83
84 NativeTabContentsViewWin::~NativeTabContentsViewWin() { 84 NativeTabContentsViewWin::~NativeTabContentsViewWin() {
85 CloseNow();
86 } 85 }
87 86
88 TabContents* NativeTabContentsViewWin::GetTabContents() const { 87 TabContents* NativeTabContentsViewWin::GetTabContents() const {
89 return delegate_->GetTabContents(); 88 return delegate_->GetTabContents();
90 } 89 }
91 90
92 void NativeTabContentsViewWin::EndDragging() { 91 void NativeTabContentsViewWin::EndDragging() {
93 delegate_->OnNativeTabContentsViewDraggingEnded(); 92 delegate_->OnNativeTabContentsViewDraggingEnded();
94 drag_handler_ = NULL; 93 drag_handler_ = NULL;
95 } 94 }
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 // NativeTabContentsView, public: 340 // NativeTabContentsView, public:
342 341
343 // static 342 // static
344 NativeTabContentsView* NativeTabContentsView::CreateNativeTabContentsView( 343 NativeTabContentsView* NativeTabContentsView::CreateNativeTabContentsView(
345 internal::NativeTabContentsViewDelegate* delegate) { 344 internal::NativeTabContentsViewDelegate* delegate) {
346 if (views::Widget::IsPureViews() && 345 if (views::Widget::IsPureViews() &&
347 views::ViewsDelegate::views_delegate->GetDefaultParentView()) 346 views::ViewsDelegate::views_delegate->GetDefaultParentView())
348 return new NativeTabContentsViewViews(delegate); 347 return new NativeTabContentsViewViews(delegate);
349 return new NativeTabContentsViewWin(delegate); 348 return new NativeTabContentsViewWin(delegate);
350 } 349 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/tab_contents/native_tab_contents_view_views.cc ('k') | views/widget/native_widget_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698