chrome/browser/ui/views/dom_view.cc - Issue 10204002: Revert 133467 - Convert the last users of DOMView to WebView.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/ui/views/dom_view.cc

Issue 10204002: Revert 133467 - Convert the last users of DOMView to WebView. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 8 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

« no previous file with comments | « chrome/browser/ui/views/dom_view.h ('k') | chrome/browser/ui/views/dom_view_browsertest.cc » ('j') | no next file with comments »

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/dom_view.h"	5 #include "chrome/browser/ui/views/dom_view.h"

6	6

7 #include "chrome/browser/profiles/profile.h"	7 #include "chrome/browser/profiles/profile.h"

8 #include "chrome/browser/renderer_preferences_util.h"	8 #include "chrome/browser/renderer_preferences_util.h"

9 #include "content/public/browser/site_instance.h"	9 #include "content/public/browser/site_instance.h"

10 #include "content/public/browser/web_contents.h"	10 #include "content/public/browser/web_contents.h"

(...skipping 67 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
78 views::NativeViewHost::ViewHierarchyChanged(is_add, parent, child);	78 views::NativeViewHost::ViewHierarchyChanged(is_add, parent, child);

79 if (is_add && GetWidget() && !native_view() && dom_contents_.get())	79 if (is_add && GetWidget() && !native_view() && dom_contents_.get())

80 AttachTabContents();	80 AttachTabContents();

81 else if (!is_add && child == this && native_view())	81 else if (!is_add && child == this && native_view())

82 Detach();	82 Detach();

83 }	83 }

84	84

85 void DOMView::AttachTabContents() {	85 void DOMView::AttachTabContents() {

86 Attach(dom_contents_->web_contents()->GetNativeView());	86 Attach(dom_contents_->web_contents()->GetNativeView());

87 }	87 }

OLD	NEW