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

Side by Side Diff: chrome/browser/ui/views/tab_contents/native_tab_contents_view_views.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_views.h" 5 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view_views.h"
6 6
7 #include "chrome/browser/renderer_host/render_widget_host_view_views.h" 7 #include "chrome/browser/renderer_host/render_widget_host_view_views.h"
8 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view_delegate .h" 8 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view_delegate .h"
9 #include "content/browser/tab_contents/tab_contents.h" 9 #include "content/browser/tab_contents/tab_contents.h"
10 #include "content/browser/tab_contents/tab_contents_view.h" 10 #include "content/browser/tab_contents/tab_contents_view.h"
11 #include "views/widget/widget.h" 11 #include "views/widget/widget.h"
12 12
13 // TODO(beng): HiddenTabHostWindow?? 13 // TODO(beng): HiddenTabHostWindow??
14 14
15 //////////////////////////////////////////////////////////////////////////////// 15 ////////////////////////////////////////////////////////////////////////////////
16 // NativeTabContentsViewViews, public: 16 // NativeTabContentsViewViews, public:
17 17
18 NativeTabContentsViewViews::NativeTabContentsViewViews( 18 NativeTabContentsViewViews::NativeTabContentsViewViews(
19 internal::NativeTabContentsViewDelegate* delegate) 19 internal::NativeTabContentsViewDelegate* delegate)
20 : views::NativeWidgetViews(delegate->AsNativeWidgetDelegate()), 20 : views::NativeWidgetViews(delegate->AsNativeWidgetDelegate()),
21 delegate_(delegate) { 21 delegate_(delegate) {
22 } 22 }
23 23
24 NativeTabContentsViewViews::~NativeTabContentsViewViews() { 24 NativeTabContentsViewViews::~NativeTabContentsViewViews() {
25 CloseNow();
26 } 25 }
27 26
28 //////////////////////////////////////////////////////////////////////////////// 27 ////////////////////////////////////////////////////////////////////////////////
29 // NativeTabContentsViewViews, NativeTabContentsView implementation: 28 // NativeTabContentsViewViews, NativeTabContentsView implementation:
30 29
31 void NativeTabContentsViewViews::InitNativeTabContentsView() { 30 void NativeTabContentsViewViews::InitNativeTabContentsView() {
32 views::Widget::InitParams params(views::Widget::InitParams::TYPE_CONTROL); 31 views::Widget::InitParams params(views::Widget::InitParams::TYPE_CONTROL);
33 params.native_widget = this; 32 params.native_widget = this;
34 params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; 33 params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
35 GetWidget()->Init(params); 34 GetWidget()->Init(params);
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 } 75 }
77 76
78 void NativeTabContentsViewViews::SetDragCursor( 77 void NativeTabContentsViewViews::SetDragCursor(
79 WebKit::WebDragOperation operation) { 78 WebKit::WebDragOperation operation) {
80 NOTIMPLEMENTED(); 79 NOTIMPLEMENTED();
81 } 80 }
82 81
83 views::NativeWidget* NativeTabContentsViewViews::AsNativeWidget() { 82 views::NativeWidget* NativeTabContentsViewViews::AsNativeWidget() {
84 return this; 83 return this;
85 } 84 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698