chrome/browser/tab_contents/chrome_web_contents_view_delegate_win.cc - Issue 9959119: Revert 130442 - Adds a TabContentsViewAura.

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/tab_contents/chrome_web_contents_view_delegate_win.cc

Issue 9959119: Revert 130442 - Adds a TabContentsViewAura. (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

Property Changes:

Added: svn:mergeinfo

« no previous file with comments | « chrome/browser/tab_contents/chrome_web_contents_view_delegate_win.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/tab_contents/chrome_web_contents_view_delegate_win.h"	5 #include "chrome/browser/tab_contents/chrome_web_contents_view_delegate_win.h"

6	6

7 #include "chrome/browser/browser_shutdown.h"	7 #include "chrome/browser/browser_shutdown.h"

8 #include "chrome/browser/tab_contents/web_drag_bookmark_handler_win.h"	8 #include "chrome/browser/tab_contents/web_drag_bookmark_handler_win.h"

9 #include "chrome/browser/ui/constrained_window_tab_helper.h"	9 #include "chrome/browser/ui/constrained_window_tab_helper.h"

10 #include "chrome/browser/ui/sad_tab_helper.h"	10 #include "chrome/browser/ui/sad_tab_helper.h"

(...skipping 144 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
155 return toplevel_widget ? toplevel_widget->GetFocusManager() : NULL;	155 return toplevel_widget ? toplevel_widget->GetFocusManager() : NULL;

156 }	156 }

157	157

158 void ChromeWebContentsViewDelegateWin::SetInitialFocus() {	158 void ChromeWebContentsViewDelegateWin::SetInitialFocus() {

159 if (web_contents_->FocusLocationBarByDefault()) {	159 if (web_contents_->FocusLocationBarByDefault()) {

160 web_contents_->SetFocusToLocationBar(false);	160 web_contents_->SetFocusToLocationBar(false);

161 } else {	161 } else {

162 web_contents_->GetView()->Focus();	162 web_contents_->GetView()->Focus();

163 }	163 }

164 }	164 }

OLD	NEW