chrome/browser/ui/views/frame/browser_view.cc - Issue 6507028: Remove usages of RootView from View by moving relevant RootView API methods t...

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

Unified Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 6507028: Remove usages of RootView from View by moving relevant RootView API methods t... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 9 years, 10 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/bookmarks/bookmark_utils.cc ('k') | chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/frame/browser_view.cc

===================================================================

--- chrome/browser/ui/views/frame/browser_view.cc (revision 75181)

+++ chrome/browser/ui/views/frame/browser_view.cc (working copy)

@@ -965,7 +965,7 @@

int count = static_cast<int>(accessible_views.size());

// Figure out which view (if any) currently has the focus.

- views::View* focused_view = GetRootView()->GetFocusedView();

+ views::View* focused_view = GetFocusManager()->GetFocusedView();

int index = -1;

if (focused_view) {

for (int i = 0; i < count; ++i) {

@@ -1007,7 +1007,7 @@

views::ViewStorage* view_storage = views::ViewStorage::GetInstance();

if (view_storage->RetrieveView(last_focused_view_storage_id_))

view_storage->RemoveView(last_focused_view_storage_id_);

- views::View* focused_view = GetRootView()->GetFocusedView();

+ views::View* focused_view = GetFocusManager()->GetFocusedView();

if (focused_view)

view_storage->StoreView(last_focused_view_storage_id_, focused_view);

}