chrome/browser/ui/views/options/advanced_contents_view.cc - Issue 6452011: Rework tree APIs to reflect Google style and more const-correctness....

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

Issue 6452011: Rework tree APIs to reflect Google style and more const-correctness.... (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/ui/views/location_bar/page_action_image_view.cc ('k') | chrome/browser/ui/views/options/content_settings_window_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/options/advanced_contents_view.cc

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

--- chrome/browser/ui/views/options/advanced_contents_view.cc (revision 74231)

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

@@ -1473,9 +1473,9 @@

// possible that the section_description_label_ has changed

// heights. And scroll us back to being visible in that case, to

// be nice to the user.

- views::View* view = section_description_label_->GetParent();

+ views::View* view = section_description_label_->parent();

while (view && view->GetClassName() != views::ScrollView::kViewClassName)

- view = view->GetParent();

+ view = view->parent();

if (view) {

gfx::Rect visible_bounds = GetVisibleBounds();

bool was_all_visible = (visible_bounds.size() == size());

@@ -1548,9 +1548,8 @@

}

void AdvancedContentsView::Layout() {

- views::View* parent = GetParent();

- if (parent && parent->width()) {

- const int width = parent->width();

+ if (parent() && parent()->width()) {

+ const int width = parent()->width();

const int height = GetHeightForWidth(width);

SetBounds(0, 0, width, height);

} else {