chrome/browser/views/options/options_window_view.cc - Issue 155668: Refactoring of tabbed-pane component so it can be ported to Linux toolkit_view

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/views/options/options_window_view.cc

Issue 155668: Refactoring of tabbed-pane component so it can be ported to Linux toolkit_view (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

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

Download patch

« no previous file with comments | « chrome/browser/views/options/languages_page_view.cc ('k') | chrome/browser/views/options/passwords_exceptions_window_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/views/options/options_window_view.cc

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

--- chrome/browser/views/options/options_window_view.cc (revision 20802)

+++ chrome/browser/views/options/options_window_view.cc (working copy)

@@ -21,7 +21,7 @@

#include "grit/chromium_strings.h"

#include "grit/generated_resources.h"

#include "grit/locale_settings.h"

-#include "views/controls/tabbed_pane.h"

+#include "views/controls/tabbed_pane/tabbed_pane.h"

#include "views/widget/root_view.h"

#include "views/window/dialog_delegate.h"

#include "views/window/window.h"

@@ -220,9 +220,7 @@

}

OptionsPageView* OptionsWindowView::GetCurrentOptionsPageView() const {

- views::RootView* contents_root_view = tabs_->GetContentsRootView();

- DCHECK(contents_root_view->GetChildViewCount() == 1);

- return static_cast<OptionsPageView*>(contents_root_view->GetChildViewAt(0));

+ return static_cast<OptionsPageView*>(tabs_->GetSelectedTab());

}

///////////////////////////////////////////////////////////////////////////////